CVSSourceCodeManager.st
author Claus Gittinger <cg@exept.de>
Tue, 24 Mar 2015 15:16:29 +0100
changeset 3834 c0b686ad7925
parent 3821 b2b15311c3cf
child 3838 474d8ec95b33
child 3848 2768cbd5b7f1
permissions -rw-r--r--
class: CVSSourceCodeManager changed: #statusOf:fileName:directory:module: care for non existing repository file
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
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    14
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    15
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    16
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    17
	instanceVariableNames:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    18
	classVariableNames:'CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    19
		DisabledModules CVSCommandSemaphore CVSExecutable
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    20
		CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
    21
		RecentlyCheckedModulesAndPackages RecentTags AuthorMap'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    22
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    23
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    24
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    25
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    26
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    27
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    28
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    29
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    30
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    31
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    32
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    33
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    34
 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
    35
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    36
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    37
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    38
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    40
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    41
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    42
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    43
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    44
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    45
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    46
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    47
    variable being set by a private.rc file).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    48
    Under that top, for each module (especially the stx module itself), 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
    If not specified otherwise, the module defaults to 'stx'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    57
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    60
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
        (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
    66
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    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
    69
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
        - 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
    82
          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
    83
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    85
        currently, the rcs container is accessed directly, since cvs mangles the file's ident-string and
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
        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
    87
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    88
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    89
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    90
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    91
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    94
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
    96
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    97
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    98
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    99
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   100
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
                                        if false, disk access is used;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
                                        files in CVSRoot must be accessable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
        should acomplish this.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
        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
   174
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   190
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   191
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   192
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   193
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   194
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   195
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   196
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   197
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   198
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   199
exeptsPrivateSTXRepositoryModuleRoot
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   200
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   201
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   202
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   203
exeptsPublicSTXRepositoryModuleRoot
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   204
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   205
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   206
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   207
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   208
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   209
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   210
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   211
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   212
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   213
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   214
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   215
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   216
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   217
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   218
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   219
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   220
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   221
3106
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   222
    | s f top cvsCmd |
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   223
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   224
    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
   225
    CVSCommitOptions := ''.
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   226
    CVSUpdateOptions := ''.
1465
b28d95c4f867 *** empty log message ***
sr
parents: 1464
diff changeset
   227
    RemoteCVS := true.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   228
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   229
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   230
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   231
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   232
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   233
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   237
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   238
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   239
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   240
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   241
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   242
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   243
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   244
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   245
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   246
    cvsCmd := self cvsExecutable.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   247
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   248
"/    ok := OperatingSystem canExecuteCommand:cvsCmd.
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   249
"/    ok ifFalse:[
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   250
"/        'CVSSourceCodeManager [warning]: disabled because no >>cvs<< command was found' infoPrintCR.
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   251
"/        ^ self
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   252
"/    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   253
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   254
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   256
    CacheDirectoryName isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
        self initCacheDirPath.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
    ].
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   259
    CachingSources isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
        CachingSources := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   261
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   262
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   263
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   264
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
1493
079d236141ef leave SourceCodeManager uninitialized
Michael Beyl <mb@exept.de>
parents: 1489
diff changeset
   272
"/    Smalltalk at:#SourceCodeManager put:self.
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   273
    DefaultManager isNil ifTrue:[
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   274
        DefaultManager := self.    
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   275
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   278
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   279
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   309
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   310
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   311
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   312
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   313
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   314
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   315
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   316
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   317
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   318
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   321
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   322
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   323
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
    AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   328
    CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   333
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   334
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   335
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   336
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   338
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   339
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   340
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   341
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   342
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   343
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   344
    |h addr|
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   345
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   346
    (h := OperatingSystem getHostName) notEmptyOrNil ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   347
        addr := IPSocketAddress hostName:h.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   348
        addr notNil ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   349
            (addr hostAddress startsWith: #[172 23 1]) ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   350
                self addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   351
            ]
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   352
        ].
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   353
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   354
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   355
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   356
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   357
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   358
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   359
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   360
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   361
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   362
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   363
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   364
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   365
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   366
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   367
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   368
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   369
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   370
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   371
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   372
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   373
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   374
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   375
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   376
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   377
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   378
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   379
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   380
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   381
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   382
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   383
    "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
   384
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   385
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   386
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   387
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   388
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   389
    "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
   390
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   391
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   392
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   393
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   394
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   395
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   396
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   397
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   398
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   399
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   400
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   401
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   402
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   403
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   404
        CVSExecutable := nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   405
    ] ifFalse:[        
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   406
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   407
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   408
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   409
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   410
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   411
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   412
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   413
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   414
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   415
     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
   416
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   417
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   418
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   419
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   420
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   421
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   422
    d exists ifFalse:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   423
        d recursiveMakeDirectory.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   424
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   425
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   426
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   427
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   428
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   429
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   430
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   431
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   432
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   433
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   434
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   435
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   436
     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
   437
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   438
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   439
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   440
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   441
    "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   442
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   443
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   444
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   445
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   446
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   447
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   448
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   449
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   450
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   451
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   452
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   453
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   454
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   455
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   456
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   457
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   458
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   459
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   460
    "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
   461
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   462
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags last].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   463
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   464
    "
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   465
     self recentTag
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   466
    "
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   467
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   468
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   469
recentTag:aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   470
    "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
   471
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   472
    "/ RecentTag := aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   473
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   474
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   475
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   476
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   477
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   478
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   479
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   480
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   481
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   482
    "a place to remember recently set tags (to share between File and SystemBrowser)"
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   483
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   484
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   485
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   486
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   487
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   488
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   489
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   490
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   491
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   492
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   493
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   494
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   495
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   496
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   497
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   498
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   499
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   500
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   501
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   502
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   503
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   504
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   505
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   506
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   507
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   508
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   509
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   510
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   511
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   512
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   514
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   517
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   518
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   519
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   520
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   521
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   522
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   523
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   525
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   528
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   531
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   532
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   533
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   546
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   561
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   562
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   563
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   564
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   565
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   566
    "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
   567
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   568
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   569
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   570
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   571
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   572
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   573
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   574
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   575
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   576
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   577
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   578
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   579
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   581
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   584
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   585
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   586
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   588
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   589
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   590
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   591
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   592
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   593
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   594
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   595
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   598
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   599
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   600
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   601
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   602
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   603
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   604
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   605
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   606
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   607
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   608
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   609
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   610
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   611
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   612
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   613
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   614
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   615
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   616
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   617
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   618
     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
   619
     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
   620
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   621
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   622
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   623
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   624
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   625
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   626
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   627
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   628
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   629
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   630
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   631
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   632
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   633
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   634
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   635
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   636
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   637
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   638
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   639
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   640
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   641
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   642
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   643
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   644
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   645
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   646
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   647
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   663
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   748
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   751
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   759
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   760
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   764
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   767
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   768
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   769
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   770
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   771
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   775
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   778
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   779
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   782
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   788
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   790
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   791
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   792
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   795
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   802
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   803
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   805
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   806
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
        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
   811
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   813
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   814
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   815
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
     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
   822
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   828
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   829
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   830
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   831
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   832
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   833
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   834
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   835
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   836
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   837
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   838
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   839
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   840
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   845
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   852
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   853
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   854
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   855
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   856
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   857
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   858
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   859
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   860
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   861
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   862
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   863
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   864
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   865
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   866
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   867
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   868
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   869
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   870
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   871
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   872
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   873
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   874
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   875
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   876
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   877
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   878
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   880
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   881
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   882
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   883
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   884
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   885
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   886
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   887
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   888
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   889
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   892
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   893
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   895
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   897
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   899
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   901
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   903
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   904
                defaultContents notNil ifTrue:[
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   905
                    s nextPutAll:s.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   906
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   914
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   916
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   943
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   945
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   951
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   953
    "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
   954
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   955
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   956
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   957
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   961
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   962
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   963
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   964
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   965
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   966
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   967
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   971
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   974
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   976
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   978
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   984
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   987
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
     The doLog argument, if false supresses a logEntry to be added 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1000
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1001
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1003
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
  1004
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1005
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1006
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1007
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1008
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1009
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1010
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1011
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1012
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1013
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
  1014
    "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
  1015
     execute command in the dirArg directory.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1016
     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
  1017
     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
  1018
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1019
    ^ self 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1020
        executeCVSCommand:cvsCommand 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1021
        module:moduleName 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1022
        inDirectory:dirArg 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1023
        log:doLog 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1024
        pipe:false 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1025
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1026
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1027
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1028
    "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
  1029
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1030
    "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
  1031
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1032
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1033
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1034
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1035
     execute command in the dirArg directory.
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1036
     The doLog argument, if false supresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1037
     in the cvs log file (used when reading / extracting history)"
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1038
    
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1039
    ^ self 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1040
        executeCVSCommand:cvsCommand 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1041
        module:moduleName 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1042
        inDirectory:dirArg 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1043
        log:doLog 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1044
        pipe:doPipe 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1045
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1046
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1047
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1048
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1049
    "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
  1050
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1051
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1052
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1053
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1054
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
  1055
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1056
     execute command in the dirArg directory (or the current directory if dirArg is nil).
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1057
     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
  1058
     in the cvs log file (used when reading / extracting history)"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1059
    
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1060
    |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
  1061
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1062
    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
  1063
        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
  1064
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1065
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1066
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1067
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1068
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1069
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1070
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1071
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1072
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1073
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1074
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1075
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1076
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1077
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1078
    "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
  1079
    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
  1080
        (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
  1081
            (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
  1082
                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
  1083
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1084
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1085
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1086
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1087
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1088
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1089
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1090
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1091
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1092
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1093
    doPipe ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1094
        rslt := PipeStream 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1095
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1096
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1097
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1098
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1099
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1100
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1101
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1102
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1103
            "/ execute the command in this thread, as opposed to the code below.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1104
            (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1105
                rslt := ok := OperatingSystem executeCommand:command 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1106
                                        inputFrom:nil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1107
                                        outputTo:outStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1108
                                        errorTo:errorStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1109
                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1110
                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1111
                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1112
                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1113
            ] ifFalse:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1114
                rslt := ok := OperatingSystem 
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1115
                                executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1116
                                errorTo:nil
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1117
                                inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1118
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1119
        ] ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1120
            CVSCommandSemaphore 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1121
                critical:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1122
                    |p errOut done|
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1123
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1124
                    errOut := WriteStream on:String new.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1125
                    p := [
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1126
                                (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1127
                                    rslt := ok := OperatingSystem executeCommand:command
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1128
                                                        inputFrom:nil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1129
                                                        outputTo:outStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1130
                                                        errorTo:errorStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1131
                                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1132
                                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1133
                                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1134
                                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1135
                                ] ifFalse:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1136
                                    rslt := ok := OperatingSystem 
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1137
                                                    executeCommand:command
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1138
                                                    outputTo:errOut
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1139
                                                    errorTo:errOut
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1140
                                                    inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1141
                                ]
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1142
                         ] fork.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1143
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1144
                    done := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1145
                    [done] whileFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1146
                        done := true.
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1147
                        (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
  1148
                            (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
  1149
                                                    bindWith:self cvsCommandTimeout with:command)) ifTrue:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1150
                                done := false
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1151
                            ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1152
                                ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1153
                                p terminate.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1154
                                ok := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1155
                                errorString := 'CVS command timeout'.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1156
                            ]
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1157
                        ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1158
                            ok ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1159
                                errorString := errOut contents.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1160
                            ].
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1161
                        ]
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1162
                    ].
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1163
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1164
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1165
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1166
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1167
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1168
        self breakPoint:#cg.
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1169
        self breakPoint:#jv.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1170
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1171
            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
  1172
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1173
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1174
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1175
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1176
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1177
    "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
  1178
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1179
    "Created: / 28-02-2012 / 17:30:34 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1180
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1181
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1184
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1189
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1191
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1192
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1193
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1194
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1195
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1196
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1198
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1199
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1202
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1203
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1208
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1209
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1210
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1211
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1212
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1213
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1214
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1215
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1216
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1217
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1218
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1219
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1220
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1221
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1222
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1223
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1224
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1225
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1226
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1230
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1235
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1236
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1239
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1241
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1242
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1243
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1244
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1245
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1246
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1247
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1248
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1249
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1250
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1251
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1252
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1253
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1254
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1255
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1256
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1257
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1258
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1259
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1260
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1261
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1262
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1263
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1264
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1265
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1275
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1281
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1292
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1296
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1302
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1303
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1304
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1305
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1306
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1309
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1310
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1311
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1312
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1313
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1314
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1315
    "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
  1316
     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
  1317
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1318
     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
  1319
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1320
              #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
  1321
              #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
  1322
              #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
  1323
              #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
  1324
              #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
  1325
              #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
  1326
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1327
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1328
    |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
  1329
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1330
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1331
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1332
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1333
    [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
  1334
        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
  1335
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1336
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1337
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1338
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1339
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1340
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1341
    (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
  1342
        record := IdentityDictionary new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1343
        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
  1344
        "/ 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
  1345
        (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
  1346
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1348
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1349
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1350
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1351
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1352
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1353
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1354
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1355
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1356
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1357
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1358
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1359
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1360
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1361
        "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
  1362
        (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
  1363
            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
  1364
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1365
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1366
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1367
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1368
        [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
  1369
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1370
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1371
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1372
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1373
                    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
  1374
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1375
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1376
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1377
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1378
                    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
  1379
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1380
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1381
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1382
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1383
        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
  1384
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1385
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1386
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1387
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
    "/
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
  1406
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1422
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1424
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1425
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1426
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1429
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1432
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1433
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1434
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1435
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1436
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1438
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1439
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1440
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1451
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1452
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1453
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1456
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1457
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1477
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1478
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1479
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1480
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1481
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1482
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1483
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1484
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1485
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1486
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1487
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1488
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1489
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1490
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1491
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1492
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1493
     Used to synthetically generate a new version method without a need to consult the
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1494
     cvs for an revision string after an update (which is slow, when done remote)"
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1495
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1496
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1497
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1498
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1500
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1503
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1504
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1506
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1507
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
        (vsnString endsWith:'m') ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1513
             "/ alread a modified class
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1514
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1515
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1516
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1517
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1518
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1520
    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1521
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1522
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1523
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1524
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1525
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1526
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1527
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1528
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1529
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1530
    "/ originalVersionString:
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  1531
    "/      '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1532
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1533
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1534
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1535
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1536
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1537
    "/      'Exp $'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1538
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'. 
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1539
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart   
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1540
!
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1541
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1542
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1543
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1544
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1548
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1549
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1555
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1557
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1560
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1563
        (vsnString endsWith:'m') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1564
             "/ alread a modified class
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1565
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1566
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1567
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1568
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1571
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1572
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1573
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1574
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1575
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1576
    "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
  1577
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1578
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1579
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1580
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1581
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1582
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1583
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1584
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1585
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1586
2449
vrany
parents: 2403
diff changeset
  1587
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1588
vrany
parents: 2403
diff changeset
  1589
    "JV@2011-07-09: The real check is too slow. Cache needed here"
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1590
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1591
vrany
parents: 2403
diff changeset
  1592
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1593
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1594
vrany
parents: 2403
diff changeset
  1595
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1596
!
vrany
parents: 2403
diff changeset
  1597
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1598
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1599
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1600
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1601
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1602
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1603
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1604
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1605
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1606
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1607
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1608
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1609
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1610
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1611
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1612
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1613
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1614
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1615
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1616
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1617
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1618
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1619
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1620
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1621
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1622
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1623
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1624
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1625
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1626
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1627
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1628
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1629
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1630
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1631
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1632
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1633
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1634
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1635
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1636
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1637
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1638
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1639
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1640
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1641
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1642
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1643
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1644
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1645
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1646
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1647
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1648
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1649
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1650
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1651
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1652
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1653
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1655
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1656
    |tempdir cmd checkoutName logMsg revision logTmp 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1657
     cmdOut whatHappened s  idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1658
     newRevision  msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1659
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
     editor checkInRepaired didAccept emphasizedText repairedText out 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1661
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1666
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1667
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1668
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1670
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1671
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1672
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1674
        "/ a new file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1675
        ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1676
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1677
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1678
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1679
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1681
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1682
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1683
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1684
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1685
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1686
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1687
        "/ 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
  1688
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1689
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1690
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1691
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1692
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1693
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1694
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1695
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1696
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1697
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1698
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1699
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1700
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1701
        "/ 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
  1702
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1704
        "/ correct our current time, so that converting it will give us UTC
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1705
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
        self createEntryFor:checkoutName 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1708
             module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1709
             in:(tempdir construct:modulePath) 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1713
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1714
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1715
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1716
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1717
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1718
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1719
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1720
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1721
        ] do:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1722
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1723
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1724
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1725
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1726
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1727
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1728
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1729
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  1730
        self activityNotification:'Merging ' , containerFilename , ' with repository version...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1731
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1732
        cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1733
        (self 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1734
            executeCVSCommand:cmd 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1735
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1736
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1737
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1739
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1744
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
            "/   M xxx   -> merged-in changes from other users
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
            "/   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
  1748
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1749
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1750
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1751
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1752
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1753
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1754
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1755
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1756
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
            "/ no change
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1758
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1759
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1761
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1762
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
        ].
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
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1768
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1770
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1771
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1772
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
                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
  1775
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1776
            changeLog notNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1777
                s := WriteStream on:String new.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1779
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1780
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1781
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1783
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1784
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1786
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1788
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1791
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1792
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1795
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1796
                            and:[(line startsWith:'Merging') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1797
                            and:[line size > 0]]]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1798
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1799
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1800
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1801
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1802
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1803
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1804
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1805
            (force 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1806
            or:[changeLog isNil 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1807
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1808
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1809
                "/ pretty good - nothing has changed in the meanwhile
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
                Transcript showCR:'checking in ' , containerFilename , ' ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1812
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1813
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1814
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1815
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1816
                "/ 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
  1817
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1818
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1819
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1821
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1822
                s := WriteStream on:String new.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1823
                s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1824
                mySource := s contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1826
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1827
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1828
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1829
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1830
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1831
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1832
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1833
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1834
                    self checkinTroubleDialog:'Merging versions'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1835
                                   message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1836
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1837
                                   abortable:false 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1838
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1839
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1840
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1841
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1842
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1843
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1844
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1845
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1846
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
  1847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1848
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1849
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1850
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1851
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1852
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1853
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1854
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1855
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1856
                    answer := self checkinTroubleDialog:'Merging versions'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1857
                                   message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1858
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1859
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1860
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1861
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1862
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1863
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1865
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1866
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1867
                                label:'merged version'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1868
                                
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1869
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1870
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1871
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1872
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1873
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1874
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1884
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1887
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1888
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1889
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
"/                ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1894
                Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1895
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1896
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1897
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1898
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1899
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1900
                "/ 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
  1901
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1902
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1903
                changesAsLogged := changesAsLogged asCollectionOfLines.
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
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1906
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1907
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1908
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1909
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1910
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1913
                answer := self checkinTroubleDialog:'Version conflict'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1914
                     message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1915
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1916
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1917
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1918
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1919
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1920
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1921
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1922
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
                    Diff3TextView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1926
                        label:'your version (checkin attempt)' 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1927
                        label:'original (base version)' 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1928
                        label:'newest repository version'. 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1929
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1930
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1935
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1936
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1937
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1938
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1939
                    "/ ... accept will check it in.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1940
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1942
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1943
                                 with:(#backgroundColor->Color green)).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
                    emphasizedText := Diff3TextView 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1945
                                emphasizeMergedDiff3Text:emphasizedText 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1946
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1947
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1949
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1950
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
                    comment := 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1953
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1954
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1955
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1956
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1957
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1958
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1959
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1960
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1961
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1963
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1964
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1965
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1966
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1967
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1968
                    [didAccept not and:[checkInRepaired]] whileTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1969
                        editor := RCSConflictEditTextView 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                                    setupWith:emphasizedText
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1971
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.    
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1972
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1973
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1974
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1976
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1977
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1980
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1981
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1982
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1983
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1984
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1985
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1986
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  1987
                            (repairedText findFirst:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ~~ 0 ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1988
                                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
  1989
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1990
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1991
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1992
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1993
                    ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1994
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1995
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1996
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1997
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1998
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1999
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2000
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2001
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2002
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2003
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2004
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2005
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2006
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2007
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2008
                checkInRepaired ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2009
                    Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2010
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2011
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2012
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2013
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2014
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2015
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2016
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2017
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2019
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2020
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2021
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2022
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2023
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2024
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2025
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2026
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2027
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2028
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2029
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2030
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2031
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2032
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2033
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2034
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2035
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
            ]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2037
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2038
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2039
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2040
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2041
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2042
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  2043
        self activityNotification:'Saving ' , containerFilename , ' in repository...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2044
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2045
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2046
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2047
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2048
            "/ save the log message into another tempFile ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2049
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2050
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2051
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2052
            s close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2054
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2055
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2057
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2058
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2059
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2060
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2064
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2066
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2067
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2068
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2069
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2070
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2071
        (self 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2072
            executeCVSCommand:cmd 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2073
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2075
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2076
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2077
                whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2078
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2079
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2080
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2081
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2082
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2083
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2084
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2085
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2086
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2087
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2088
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2089
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2090
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2091
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2092
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2093
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
            whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2096
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2099
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2100
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2101
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2102
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2104
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2105
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2106
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2107
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2108
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2109
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2110
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2111
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2112
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2113
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2114
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2115
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2116
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2117
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2118
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2119
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2120
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2121
    "Modified: / 12-11-2010 / 11:04:10 / cg"
2823
70f154c6ee66 changed: #checkin:text:directory:module:logMessage:force:
sr
parents: 2822
diff changeset
  2122
    "Modified: / 19-04-2012 / 14:18:24 / sr"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2124
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2125
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2126
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2127
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2128
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2129
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2130
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2131
    |tempdir cmd checkoutName logMsg revision newestRevision logTmp 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
     cmdOut whatHappened s entry idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
     newRevision newString binRevision className msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2134
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2135
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out 
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2136
     emSep comment force conflictResolvedManually revisionOption|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2137
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2138
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2139
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2140
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2141
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2142
        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
  2143
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
    ].
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  2145
    revision := "cls revision" cls revisionOfManager:self.        
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2146
    (revision notNil and:[revision endsWith:$m]) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2147
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2148
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2150
        "/ must use the original revision string.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2151
        revision := revision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2153
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2154
        revision ~= binRevision ifTrue:[
3317
ca815e9ab789 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3295
diff changeset
  2155
            Transcript showCR:('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?'))
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
    revision isNil ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2160
        revision := newestRevision := self newestRevisionOf:cls.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2161
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
            force ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2163
                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
  2164
                revision isNil ifTrue:[
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2165
                    revision := '1.0'   "/ initial checkin
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2166
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2167
            ] ifFalse:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2168
                revision := '1.0'   "/ initial checkin
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2169
            ]
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2170
        ] ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2171
            revision == #deleted ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2172
                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
  2173
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2174
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2175
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2176
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2177
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2178
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2179
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2180
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2181
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2182
            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
  2183
            ^ false.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2184
        ].    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2188
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2190
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2195
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2197
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2198
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2199
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2200
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2201
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2202
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2203
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2204
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2205
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2206
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2207
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2208
        "/ 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
  2209
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2210
        modulePath :=  moduleDir , '/' , packageDir. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2211
        checkoutName :=  modulePath , '/' , classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2212
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2213
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2214
        "/ correct our current time, so that converting it will give us UTC
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2215
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2216
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2217
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2218
        self createEntryFor:checkoutName 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2219
             module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2220
             in:(tempdir construct:modulePath) 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2221
             revision:revision
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2222
             date:(self cvsTimeString:time)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2223
             special:''
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2224
             overwrite:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2225
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2226
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2227
        "/ copy-over our current version
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
        Error handle:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2230
            self reportError:'cannot copy-over filedOut class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2231
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2232
        ] do:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2233
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
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
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2237
        "/ synchronize i.e. merge in any changes
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2238
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  2239
        self activityNotification:'Merging ' , cls name , ' with repository version...'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2240
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2241
        revisionOption := ''.
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2242
        (revision asCollectionOfSubstringsSeparatedBy:$.) size > 2 ifTrue:[
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2243
            "must be a branch, compare with branch revision"
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2244
            revisionOption := '-r ', revision copyUpToLast:$..
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2245
        ].
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2246
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2247
        cmd := 'update %1 %4 %2 >"%3"'
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2248
            bindWith:CVSUpdateOptions
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2249
            with:classFileName
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2250
            with:cmdOut name
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2251
            with:revisionOption.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2252
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2253
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2254
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2255
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2256
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2257
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2258
            force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2259
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2260
                    "/ no container
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2261
                    "/ someone fiddled around with repository ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2262
                    (cls binaryRevision notNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2263
                        (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
  2264
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2265
                            cls setBinaryRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2266
                            ^ 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
  2267
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2268
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2269
                    (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
  2270
                    ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2271
                        ^ false
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2272
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2273
                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2274
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2275
                "/ is the version correct ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2276
                newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2277
                    newestRevision := self newestRevisionOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2278
                    newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2279
                        (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
  2280
                            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2281
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2282
                        ^ self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2283
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2284
                            source:sourceFileName logMessage:logMessage force:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2285
                    ].
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2286
                ].
2483
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2287
"/            revision > newestRevision ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2288
"/                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
  2289
"/                ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2290
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2291
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2292
"/                    ^ 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
  2293
"/                ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2294
"/            ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2295
"/
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2296
"/            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
  2297
"/            ^ false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2298
                "/ if we arrive here, proceed as if merged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2299
                whatHappened := 'M initial'
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
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2302
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2303
            "/ check what happened - the contents of the cmdOut file may be:
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2304
            "/   empty   -> nothing changed
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2305
            "/   M xxx   -> merged-in changes from other users
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2306
            "/   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
  2307
            "/              needs special action
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2308
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2309
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  2310
                whatHappened := cmdOut contentsAsString.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2311
            ] ifFalse:[
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2312
                self breakPoint:#cg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2313
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2314
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2315
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2316
        (whatHappened isEmptyOrNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2317
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2318
            "/ no change
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2319
            "/
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2320
        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2321
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2322
            force ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2323
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2324
"/                (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
  2325
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2326
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2327
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  2328
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2329
"/            ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2330
                self postCheckInClass:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2331
            ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2332
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2333
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2334
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2335
                    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
  2336
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2337
                    entry := (changeLog at:#revisions) first.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2338
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2339
                    newString isEmptyOrNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2340
                        'CVSSourceCodeManager [error]: missng revisionString' errorPrintCR
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2341
                    ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2342
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2343
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2344
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2345
                        ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2346
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2347
                        ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2348
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2349
                ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2350
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2351
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2352
            ^ true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2353
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2354
        Verbose == true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2355
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2356
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2357
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2358
        force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2359
            revision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2360
                changeLog := self revisionLogOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2361
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2362
                changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
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
            changeLog notNil ifTrue:[
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2365
                s := CharacterWriteStream on:String new.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2366
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2367
                changesAsLogged := s contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2368
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2369
                "/ mhmh - that should not happen
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2370
                changesAsLogged := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2371
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2372
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2373
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2374
        didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2375
        conflictResolvedManually := checkInRepaired := checkInNew := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2376
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2377
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2378
        "/ cvs above rel10 returns a multiline info ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2379
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2380
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2381
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2382
        whatHappened := whatHappened select:[:line |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2383
                            (line startsWith:'RCS file') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2384
                            and:[(line startsWith:'retrieving') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2385
                            and:[(line startsWith:'Merging') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2386
                            and:[line size > 0]]]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2387
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2388
        whatHappened := whatHappened asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2389
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2390
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2391
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2392
            "/ merged in changes / resurrected
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2393
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2394
            (force 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2395
            or:[changeLog isNil 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2396
            or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2397
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2398
                "/ pretty good - nothing has changed in the meanwhile
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2399
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2400
                Transcript showCR:('checking in %1 (%2)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2401
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2402
                |mySource mergedSource |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2403
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
                "/ 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
  2406
                "/ and version have been merged.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2407
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2408
                didMerge := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2409
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2410
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2411
                s := WriteStream on:String new.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2412
                self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2413
                mySource := s contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2414
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2415
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2416
                mySource = mergedSource ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2417
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2418
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2419
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2420
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2421
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2422
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2423
                    self checkinTroubleDialog:'Merging versions'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2424
                                   message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2425
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2426
                                   abortable:false 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2427
                                   option:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2428
                    didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2429
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2430
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2431
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2432
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2433
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2434
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2435
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
  2436
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2437
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2438
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2439
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2440
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2441
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2442
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2443
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2444
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2445
                    answer := self checkinTroubleDialog:'Merging versions'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2446
                                   message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2447
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2448
                                   abortable:true
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2449
                                   option:'Stop - see first'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2450
                                   option2:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2451
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2452
                    answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2453
                        (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
  2454
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2455
                            s := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2456
                            self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2457
                            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2458
                            answer := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2459
                        ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2460
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2461
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2462
                    answer ~~ true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2463
                        answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2464
                            DiffCodeView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2465
                                openOn:mySource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2466
                                label:'current version'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2467
                                and:mergedSource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2468
                                label:'merged version'.
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2469
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2470
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2471
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2472
                        ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2473
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2474
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2476
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2477
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2478
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2479
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2480
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2481
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2482
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2483
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2484
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2485
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2486
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2490
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2491
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2492
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2494
"/                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2495
                Transcript showCR:('checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
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
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2498
            (whatHappened startsWith:'C ') ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2499
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2500
                "/ conflict; someone else checked in something in the meanwhile,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2501
                "/ 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
  2502
                "/
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
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2505
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2506
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2507
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2508
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2509
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2510
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
  2511
and change your methods avoiding conflicts. Then checkin again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2512
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2513
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2514
                answer := self checkinTroubleDialog:'Version conflict'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2515
                     message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2516
                     log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2517
                     abortable:false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2518
                     option:'Show conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2519
                     option2:'Resolve conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2520
                     option3:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2521
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2522
                answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2523
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2524
                    "/ show conflicts in a 3-way DiffTextView ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2525
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2526
                    Diff3TextView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2527
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2528
                        label:'your version (checkin attempt)' 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2529
                        label:'original (base version)' 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2530
                        label:'newest repository version'. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2531
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2532
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2533
                answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2534
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2535
                    "/ allow checkin of repair version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2536
                    "/ this is error prone ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2537
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2538
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2539
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2540
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2541
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2542
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2543
                    emSep := (Array with:(#color->Color black)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2544
                                 with:(#backgroundColor->Color green)).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2545
                    emphasizedText := Diff3TextView 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2546
                                emphasizeMergedDiff3Text:emphasizedText 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2547
                                emphasize1:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2548
                                                  with:(#backgroundColor->Color blue))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2549
                                emphasize2:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2550
                                                  with:(#backgroundColor->Color red))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2551
                                emphasizeSep:emSep.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2552
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2553
                    comment := 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2554
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2555
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2556
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2557
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2558
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2559
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2560
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2561
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2563
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2564
'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2565
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2566
                    emphasizedText := comment , emphasizedText.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2567
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2568
                    didAccept := false. checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2569
                    [didAccept not and:[checkInRepaired]] whileTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2570
                        editor := RCSConflictEditTextView 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2571
                                    setupWith:emphasizedText
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2572
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.    
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2573
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2574
                        editor acceptAction:[:dummy |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2575
                            repairedText := editor list.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2576
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2577
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2578
                        didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2579
                        editor topView openModal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2580
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2581
                        didAccept ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2582
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2583
                            ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2584
                                checkInRepaired := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2585
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2586
                        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2587
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  2588
                            (repairedText findFirst:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ~~ 0 ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2589
                                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
  2590
                                didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2591
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2592
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2593
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2594
                    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2595
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2596
                    checkInRepaired ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2597
                        [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2598
                            out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2599
                            out nextPutAll:(repairedText asString string).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2600
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2601
                            out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2602
                        ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2603
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2604
                            checkInRepaired := false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2605
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2606
                    ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2607
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2608
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2609
                answer == #option3 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2610
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2611
                    "/ force checkin of new version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2612
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2613
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2614
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2615
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2616
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2617
                    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2618
                        out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2619
                        self fileOutSourceCodeOf: cls on:out.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2620
                        out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2621
                        didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2622
                        checkInNew := checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2623
                    ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2624
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2628
                checkInRepaired ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2629
                    checkInNew ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2630
                        Transcript showCR:('checking in %1 (%2) (force)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2631
                    ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2632
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2633
                        Transcript showCR:('checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2634
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2635
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2636
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2637
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2638
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2639
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2640
            ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2641
                ((whatHappened startsWith:'U ') 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2642
                or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2643
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2644
                    "/ nothing changed here, but the repository already contains
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2645
                    "/ a newer version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2646
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2647
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2648
                    self information:'nothing changed in your ''' , className , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2649
but repository already contains a newer version (repository unchanged).'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2650
                    ^ true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2651
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2652
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2653
                    "/ unexpected
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2654
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2655
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2656
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2657
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2658
No checkin performed.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2659
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2660
                    ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2661
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2662
            ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2663
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2664
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
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2667
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2668
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  2669
        self activityNotification:'Saving ' , cls name , ' in repository...'.
3265
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
        logMsg := logMsg replChar:$"  withString:'\"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2672
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2673
        OperatingSystem isUNIXlike ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2674
            "/ save the log message into another tempFile ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2675
            logTmp := Filename newTemporaryIn:tempdir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2676
            s := logTmp writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2677
            s nextPutAll:logMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2678
            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2679
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2680
            cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2681
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2682
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2683
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2684
            "/ CVS V1.9.16 to stdout.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2685
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2686
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2687
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2688
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2689
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2690
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2691
            inDirectory:tempdir name
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2692
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2693
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2694
                whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2695
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2696
                whatHappened := '<< no message >>'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2697
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2698
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2700
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2701
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2702
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2703
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2704
            logTmp notNil ifTrue:[logTmp remove].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2705
            self reportError:'cannot checkin modified class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2706
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2707
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2708
        logTmp notNil ifTrue:[logTmp remove].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2709
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2710
            whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2711
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2712
            whatHappened := nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2713
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2714
    ] ensure:[
3817
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2715
        OperatingSystem accessDeniedErrorSignal handle:[:ex |
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2716
            Dialog warn:('Warning: some problem encountered when trying to remove a temporary workfile:\\%1\\The checkin was successful, though.\Please remove those temporary files later.' withCRs
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2717
                        bindWith:ex description).
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2718
            ex proceed.
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2719
        ] do:[
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2720
            tempdir notNil ifTrue:[ tempdir recursiveRemove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2721
            cmdOut notNil ifTrue:[ cmdOut remove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2722
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2723
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2724
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2725
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2726
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2727
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2728
    (whatHappened isEmptyOrNil) ifTrue:[
3112
5ccec8607540 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3106
diff changeset
  2729
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2730
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2731
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2732
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2733
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2734
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2735
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2736
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2737
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2738
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2739
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2740
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2741
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2742
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2743
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2744
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2745
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2746
    "/   (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
  2747
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2748
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2749
    "/ 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
  2750
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2751
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2753
    "/    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
  2754
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2755
    newRevision notNil ifTrue:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2756
        (didMerge or:[conflictResolvedManually]) ifFalse:[
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2757
            "/ new code:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2758
            cls revisionString notEmptyOrNil ifTrue:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2759
                newRevision isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2760
                    'CVSSourceCodeManager [error]: got no valid revisionString (class checked in, but no valid revision returned)' errorPrintCR
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
  2761
                ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2762
                    newString := self updatedRevisionStringOf:cls forRevision:newRevision andUser:OperatingSystem getLoginName with:cls revisionString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2763
                    newString isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2764
                        'CVSSourceCodeManager [error]: failed to update revisionString (class checked in, but no revision method)' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2765
                    ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2766
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2767
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2768
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2769
                        ].
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
  2770
                    ].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2771
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2772
                self activityNotification:'Done.'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2773
            ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2774
                self activityNotification:'Fetch new revision number of ', cls name.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2775
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2776
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2777
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2778
                    force ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2779
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2780
                    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2781
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2782
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2783
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2784
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2785
                ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2786
                    entry := (changeLog at:#revisions) first.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2787
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2788
                    self updateVersionMethodOf:cls for:newString.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2789
                    cls revision ~= newRevision ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2790
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2791
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2792
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2793
            ]
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2794
        ] ifTrue:[      
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2795
            "/ 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
  2796
            "/ (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
  2797
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2798
            "/ 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
  2799
            didMerge ifTrue: [
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2800
                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
  2801
                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
  2802
            ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2803
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2804
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2805
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2806
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2807
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2808
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2809
    conflictResolvedManually ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2810
        self information:'Now the repository contains a merge between your and the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2811
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2812
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2813
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2814
2604
e0743b3ba275 message text only
Claus Gittinger <cg@exept.de>
parents: 2601
diff changeset
  2815
I recommend doing this as soon as possible via your browser''s checkout function.'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2816
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2817
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2818
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2819
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2820
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2821
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2822
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2823
    "Created: / 11-09-1996 / 16:16:11 / cg"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2824
    "Modified: / 26-02-1998 / 17:34:16 / stefan"
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2825
    "Modified: / 31-07-2013 / 18:07:53 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2826
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2827
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2828
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2829
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2830
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2831
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2832
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2833
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2834
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2835
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2836
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2837
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2841
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2842
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2843
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2844
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2845
    self activityNotification:'Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2847
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2848
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2849
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2850
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2851
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2852
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2853
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2854
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2855
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2856
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2857
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2858
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2859
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2860
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2861
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2862
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2863
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2864
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2865
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2866
            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
  2867
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2868
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2869
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2870
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2871
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2872
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2873
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2874
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2875
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2876
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2877
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2878
    "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
  2879
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2881
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2882
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2883
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2884
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2885
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2887
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2888
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2890
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2891
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2892
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2893
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2894
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2895
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2896
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2897
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2898
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2899
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2900
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2901
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2902
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2903
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2904
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2905
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2906
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2907
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2908
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2910
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2912
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2914
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2915
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2916
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
    fullName := moduleDir , '/' , packageDir , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2923
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2924
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2925
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2928
    "/ 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
  2929
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2930
    "/ 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
  2931
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2932
    "/ (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
  2933
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2934
   (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
  2935
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2936
            ('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
  2937
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2938
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2939
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2940
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2941
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2942
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2943
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2944
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2948
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2949
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
    "/ 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
  2951
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2952
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2953
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2954
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2955
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2956
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2957
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2958
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2959
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2960
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2961
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2962
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2963
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2964
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2965
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2966
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2967
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2968
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2969
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2970
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2973
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2974
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2975
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2976
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2977
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2978
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2979
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2980
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2981
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2982
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2983
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2984
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2985
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2986
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2987
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2988
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2989
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2990
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2991
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2992
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2993
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2994
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2995
        self activityNotification:'Checking out source ' , checkoutName , revMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2996
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2997
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  2998
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  2999
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3000
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3001
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3002
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3003
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3004
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3005
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3006
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3007
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3008
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3009
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3010
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3011
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3012
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3013
"/        "/ 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
  3014
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3015
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3016
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3017
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3018
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3019
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3020
"/            ('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
  3021
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3022
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3023
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3024
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3025
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3026
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3027
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3028
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3029
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3030
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3031
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3032
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3033
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3034
            ('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
  3035
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3036
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3037
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3038
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3039
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3040
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3041
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3042
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3043
                fullTempName moveTo:fullCachedName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3044
                self activityNotification:'Cached as ',fullCachedName asFilename baseName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3045
            ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3046
                self activityNotification:'Not cached.'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3047
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3048
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3049
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3050
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3051
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3052
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3053
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3054
            fileName = 'extensions.st' ifTrue:[
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3055
                self activityNotification:('"%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3056
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3057
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3058
            ] ifFalse:[
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3059
                self activityNotification:('"%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3060
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3061
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3062
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3063
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3064
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3065
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3066
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3067
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3068
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3069
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3070
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3071
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3072
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3073
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3074
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3075
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3076
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3077
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3078
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3079
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3080
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3081
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3082
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3083
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3084
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3085
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3086
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3087
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3088
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3089
    "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
  3090
    "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
  3091
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3092
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3093
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3094
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3095
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3096
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3097
    "return info about who changed what and when.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3098
     Return nil on failure.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3099
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3100
     The returned information is a structure entry for each line
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3101
            #revision           -> version of last change
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3102
            #author             -> author 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3103
            #date               -> change date 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3104
        "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3105
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3106
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3107
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3108
    tempDir := self createTempDirectory:nil forModule:nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3109
    tempDir isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3110
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3111
        ^ nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3112
    ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3113
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3114
    [
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3115
        |cmd revArg|
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3116
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3117
        modulePath :=  moduleDir , '/' , packageDir. 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3118
        fullName :=  modulePath , '/' , classFileName.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3119
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3120
        self createEntryFor:fullName 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3121
             module:moduleDir
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3122
             in:(tempDir construct:modulePath) 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3123
             revision:'1.1' 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3124
             date:'dummy' 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3125
             special:''
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3126
             overwrite:false.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3127
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3128
        msg := 'Fetching annotation log '.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3129
        clsOrNil isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3130
            msg := msg , 'in ' , fullName.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3131
        ] ifFalse:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3132
            msg := msg , 'of ', clsOrNil name.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3133
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3134
        self activityNotification:msg,'...'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3135
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3136
        inStream := self 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3137
                        executeCVSCommand:('annotate ' , fullName) 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3138
                        module:moduleDir 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3139
                        inDirectory:tempDir 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3140
                        log:true 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3141
                        pipe:true.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3142
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3143
        inStream isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3144
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3145
            ^ nil
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3146
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3147
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3148
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3149
        "/ read the commands pipe output and extract the info
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3150
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3151
        info := IdentityDictionary new.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3152
        inHeaderInfo := true.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3153
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3154
            line:= inStream nextLine.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3155
            ((line ? '') startsWith:'*******') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3156
                inHeaderInfo := false.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3157
            ]
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3158
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3159
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3160
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3161
        "/ continue to read the commands pipe output 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3162
        "/ and extract change info records
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3163
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3164
        [inStream atEnd] whileFalse:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3165
            line := inStream nextLine.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3166
Transcript showCR:line.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3167
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3168
    ] ensure:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3169
        inStream notNil ifTrue:[inStream close].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3170
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3171
        tempDir notNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3172
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3173
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3174
            ] do:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3175
                tempDir recursiveRemove
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3176
            ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3177
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3178
        self activityNotification:nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3179
    ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3180
    ^ info
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3181
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3182
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3183
     SourceCodeManager 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3184
        annotationsFor:Array 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3185
        fileName:'Array.st' directory:'libbasic' module:'stx'
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3186
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3187
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3188
     SourceCodeManager 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3189
        annotationsFor:MenuPanel 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3190
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3191
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3192
!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3193
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3194
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3195
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3197
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3198
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3199
    cvsRoot := self getCVSROOTForModule:moduleDir.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3200
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3201
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3202
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3203
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3204
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3205
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3208
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3209
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3210
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3213
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3214
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3215
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3216
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3218
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3221
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3222
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3224
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3225
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3226
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3227
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3228
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3229
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3230
    "/ 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
  3231
    "/ (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
  3232
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3233
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3234
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3235
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3236
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3237
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3238
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
                    executeCVSCommand:cmd , fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
                    module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3243
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3244
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3245
                    inDirectory:(tempDir pathName) 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3246
                    log:false
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3247
                    outputTo:outputStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3248
                    errorTo:errorStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3249
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3250
        "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
  3251
         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
  3252
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3253
        "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
  3254
        "/ cg: read comment above.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3255
        ret2 := errorStream size == 0.
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3256
        ret2 ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3257
            ret2 := (errorStream contents asCollectionOfLines 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3258
                        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
  3259
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3260
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3262
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3263
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3266
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3267
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3268
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3269
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3270
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3271
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3272
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3273
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3274
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3275
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3277
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3278
    "Created: / 13-09-2006 / 18:20:36 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3282
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3283
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3284
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3285
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3286
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3287
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3288
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3289
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3290
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3291
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3292
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3293
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3294
    self activityNotification:'Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3296
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3297
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3299
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3300
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3302
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3303
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3304
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3305
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3306
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3307
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3308
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3309
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3310
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3311
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3312
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3313
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3314
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3315
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3316
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3317
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3318
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3319
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3320
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3321
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3322
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3323
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3324
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3325
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3326
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3327
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3328
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3329
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3331
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3332
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3333
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3334
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3335
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3339
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3340
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3341
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3342
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3343
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3344
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3345
    "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
  3346
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3347
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3350
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3351
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3352
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3353
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3354
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3355
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3356
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3357
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3358
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3359
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3360
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3361
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3362
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3363
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3365
    self activityNotification:'Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3366
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3367
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3368
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3369
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3370
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3371
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3372
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3373
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3374
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3375
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3376
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3377
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3378
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3379
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3380
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3381
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3382
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3383
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3384
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3385
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3386
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3387
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3388
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3389
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3390
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3391
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3392
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3393
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3394
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3395
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3396
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3397
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3398
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3399
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3403
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3404
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3406
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3407
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3418
    "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
  3419
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3421
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3429
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3430
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3431
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3432
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3447
    self activityNotification:'Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
    ].
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
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3457
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3472
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3482
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
    "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3485
    self activityNotification:'Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3494
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
    "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3512
    self activityNotification:'Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3536
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3562
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
                newRevision := '1.1'
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
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    "/ (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
  3601
    "/  correctly for all unchanged methodss)
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
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3618
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
        ]
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3629
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3630
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3631
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3654
    self activityNotification:'Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3684
        self activityNotification:'Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3691
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
        "/
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  3710
        self activityNotification:'Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3734
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3741
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3754
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3755
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3756
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3757
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3759
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3773
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3774
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3794
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3795
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3796
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3797
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3798
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3799
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3808
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3809
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3810
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3811
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3812
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3836
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3837
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3838
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3841
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3842
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3844
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3849
    "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
  3850
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3851
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3854
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3856
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3857
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3859
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3863
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3864
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
        ('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
  3872
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3878
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3880
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3883
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3884
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3885
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3890
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3893
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3894
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3895
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3896
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3897
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3905
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3906
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3907
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3908
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3909
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3910
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3911
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3916
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3918
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
        tempdir recursiveRemove.
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
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3933
    "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
  3934
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3935
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3936
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3937
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3938
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
  3939
    "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
  3940
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3941
    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
  3942
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3943
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3944
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3945
        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
  3946
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3947
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3948
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3949
diffListFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir revision1:rev1 revision2:rev2
3323
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3950
    "return diff info. This is supposed to return a standard diff-like
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3951
     list of lines, representing the diffs between two revisions.
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3952
     experimental (for ownershipGraph)"
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3953
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3954
    ^  self
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3955
        diffListFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3956
        cache:true
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3957
!
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3958
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3959
diffListFor:clsOrNil fileName:classFileNameArg directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 cache:cacheIt
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3960
    "return diff info. This is supposed to return a standard diff-like
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3961
     list of lines, representing the diffs between two revisions.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3962
     experimental (for ownershipGraph)"
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3963
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3964
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName|
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3965
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3966
    clsOrNil notNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3967
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3968
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3969
    ] ifFalse:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3970
        modulePath :=  moduleDir , '/' , packageDir. 
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3971
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3972
    ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3973
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3974
   (cacheIt) ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3975
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3976
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3977
        ] ifFalse:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3978
            (cacheDir / modulePath / '.diffs') exists ifFalse:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3979
                (cacheDir / modulePath / '.diffs') makeDirectory.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3980
            ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3981
            cachedFile := cacheDir / modulePath / '.diffs' / (classFileName,'_',rev1,'_',rev2).
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3982
            cachedFile exists ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3983
                ^ cachedFile contents
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3984
            ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  3985
        ].
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3986
    ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3987
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3988
    tempDir := self createTempDirectory:nil forModule:nil.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3989
    tempDir isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3990
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3991
        ^ nil.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3992
    ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3993
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3994
    [
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3995
        self createEntryFor:fullName 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3996
             module:moduleDir
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3997
             in:(tempDir construct:modulePath) 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3998
             revision:'1.1' 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3999
             date:'dummy' 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4000
             special:''
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4001
             overwrite:false.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4002
3813
04e40bdd7252 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3811
diff changeset
  4003
        msg := 'Fetching diff list of '.
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4004
        clsOrNil isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4005
            msg := msg , fullName.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4006
        ] ifFalse:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4007
            msg := msg , clsOrNil name.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4008
        ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4009
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4010
        self activityNotification:msg.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4011
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4012
        inStream := self 
3369
0e42f9543608 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3363
diff changeset
  4013
                        executeCVSCommand:('diff -w -r%1 -r%2 %3' bindWith:rev1 with:rev2 with:fullName) 
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4014
                        module:moduleDir 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4015
                        inDirectory:tempDir 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4016
                        log:true 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4017
                        pipe:true.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4018
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4019
        inStream isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4020
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4021
            ^ nil
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4022
        ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4023
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4024
        "/
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4025
        "/ read the commands pipe output and extract the container info
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4026
        "/
3336
f813960e3a01 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3333
diff changeset
  4027
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4028
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4029
        list := inStream contents.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4030
    ] ensure:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4031
        inStream notNil ifTrue:[inStream close].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4032
        tempDir recursiveRemove
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4033
    ].
3323
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  4034
    list := list reject:[:line | line startsWith:'\ '].
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4035
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4036
    cachedFile notNil ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4037
        cachedFile contents:list.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4038
    ].
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4039
    ^ list
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4040
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4041
    "
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4042
     SourceCodeManager statusOf:Array 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4043
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4044
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4045
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4046
    "
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4047
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4048
    "Modified: / 29-08-2006 / 13:18:00 / cg"
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4049
!
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4050
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4051
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
  4052
    "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
  4053
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4054
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4055
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4056
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4057
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4058
     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
  4059
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4060
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4061
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4062
    "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
  4063
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4064
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4065
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4066
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4067
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4068
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4069
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4070
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4071
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4072
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4073
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4074
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4075
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4076
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4077
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4078
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4079
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4080
    "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
  4081
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4082
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4083
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4084
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4085
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4086
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4087
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4088
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4089
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4090
    "return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4091
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4092
    |cvsRoot|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4093
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4094
    cvsRoot := self getCVSROOTForModule:moduleDir.
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  4095
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4096
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4097
        initialRCSRevisionStringFor:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4098
        in:(cvsRoot , '/' , moduleDir , '/' , packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4099
        container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4100
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  4101
    "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
  4102
    "Created: / 23-08-2006 / 14:05:46 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4103
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4104
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4105
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4106
    "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
  4107
     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
  4108
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4109
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4110
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4111
    self activityNotification:'getting list of directories...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4112
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4113
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4114
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4115
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4116
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4117
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4118
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4119
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4120
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4121
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4122
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4123
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4124
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4125
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4126
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4127
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4128
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4129
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4130
    |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
  4131
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4132
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4133
    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
  4134
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4135
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4136
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4137
                        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
  4138
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4139
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4140
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4141
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4142
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4143
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4144
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4145
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4146
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4147
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4148
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4149
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4150
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4151
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4152
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4153
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4154
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4155
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4156
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4157
                "/ '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
  4158
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4159
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4160
                    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
  4161
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4162
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4163
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4164
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4165
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4166
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4167
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4168
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4169
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4170
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4171
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4172
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4173
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4174
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4175
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4176
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4177
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4178
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4179
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4180
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4181
     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
  4182
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4183
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4184
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4185
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4186
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4187
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4188
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4189
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4190
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4191
    self activityNotification:'getting list of containers...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4192
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4193
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4194
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4195
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4196
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4197
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4198
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4199
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4200
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4201
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4202
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4203
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4204
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4205
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4206
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4207
    "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
  4208
     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
  4209
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4210
    |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
  4211
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4212
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4213
         "/ Uses 'cvs status' - rlog seems not to work and/or is slower
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4214
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4215
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4216
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4217
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4218
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4219
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4220
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4221
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4222
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4223
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4224
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4225
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4226
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4227
    modulePath :=  moduleDir , '/' , packageDir. 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4228
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4229
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4230
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4231
        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
  4232
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4233
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4234
                        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
  4235
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4236
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4237
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4238
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4239
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4240
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4241
            ('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
  4242
            "/ 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
  4243
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4244
                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
  4245
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4246
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4247
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4248
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4249
            "/ 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
  4250
            "/ 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
  4251
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4252
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4253
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4254
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4255
                log:true 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4256
                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
  4257
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4258
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4259
            "/ 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
  4260
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4261
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4262
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4263
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4264
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4265
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4266
                        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
  4267
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4268
                            (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
  4269
                                "/ 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
  4270
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4271
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4272
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4273
                        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
  4274
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4275
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4276
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4277
                                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
  4278
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4279
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4280
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4281
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4282
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4283
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4284
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4285
        ('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
  4286
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4287
        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
  4288
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4289
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4291
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4292
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4293
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4294
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4295
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4296
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4297
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4298
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4299
    "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
  4300
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4301
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4302
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4303
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4304
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4305
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4306
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4307
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4308
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4309
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4310
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4311
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4312
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4313
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4314
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4315
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4316
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4317
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4318
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4319
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4320
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4321
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4322
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4323
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4324
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4325
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4326
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4327
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4328
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4329
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4330
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4331
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4332
    self activityNotification:'removing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4333
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4334
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4335
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4336
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4337
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4338
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4339
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4340
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4341
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4342
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4343
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4344
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4345
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4346
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4347
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4348
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4349
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4350
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4351
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4352
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4353
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4354
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4355
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4356
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4357
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4358
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4359
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4360
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4361
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4362
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4363
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4364
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4365
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4366
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4367
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4368
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4369
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4370
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4371
    self activityNotification:'committing removal of ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4372
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4373
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4374
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4375
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4376
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4377
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4378
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4379
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4380
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4381
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4382
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4383
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4384
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4385
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4387
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4388
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4390
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4391
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4392
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4394
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4399
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4400
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4406
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4407
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4408
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4411
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4412
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4413
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4414
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4415
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4416
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4417
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4418
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4419
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4420
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4421
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4422
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4423
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4424
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4425
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4426
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4427
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4428
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4429
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4430
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4431
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4432
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4433
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4434
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4435
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4436
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4437
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4438
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4441
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4442
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4443
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4444
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4445
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4446
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4447
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4464
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4465
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4466
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4467
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4468
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4469
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4474
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4475
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4476
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4477
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4478
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4479
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4480
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4481
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4482
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4483
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4484
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4485
        cmd := cmd , ' history -x ARM -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4486
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4487
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4488
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4489
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4490
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4491
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4492
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4493
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4494
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4495
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4496
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4497
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4498
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4499
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4500
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4501
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4502
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4503
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4504
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4505
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4506
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4507
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4508
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4509
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4510
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4511
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4512
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4513
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4514
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4515
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4516
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4517
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4518
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4519
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4520
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4521
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4522
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4523
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4524
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4525
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4526
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4527
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4528
                        words := line asCollectionOfWords.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4529
                        words size < 8 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4530
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4531
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4532
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4533
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4534
                            fileName := words at:7.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4535
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4536
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4537
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4538
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4539
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4540
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4541
                                    time := words at:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4542
                                    rev := words at:6.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4543
                                    pkgDir := words at:8.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4544
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4545
                                    module := pkgDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4546
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4547
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4548
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4549
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4550
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4551
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4552
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4554
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4555
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4556
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4557
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4558
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4559
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4560
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4561
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4562
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4563
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4564
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4565
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4566
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4567
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4568
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4569
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4570
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4571
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4572
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4573
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4574
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4575
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4576
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4577
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4578
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4579
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4580
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4581
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4582
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4583
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4584
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4585
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4586
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4587
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4588
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4589
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4590
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4591
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4592
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4593
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4594
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4595
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4596
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4597
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4598
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4599
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4600
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4601
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4602
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4603
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4604
    "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
  4605
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4606
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4607
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4608
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4609
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4610
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4611
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4612
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4613
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4614
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4615
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4616
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4617
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4618
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4619
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4620
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4621
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4622
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4623
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4624
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4625
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4626
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4627
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4628
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4629
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4630
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4631
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4632
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4633
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4634
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4635
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4636
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4637
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4638
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4639
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4640
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4641
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4642
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4643
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4644
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4645
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4646
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4647
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4648
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4649
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4650
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4651
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4652
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4653
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4654
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4655
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4656
            box addCheckBoxAtBottom:'Do not show this dialog again (always fix & proceed)' on:autoFixHolder.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4657
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4658
            "/ info: in some older ST/X releases, there have been bugs in the header string rewriting code,
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4659
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4660
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4661
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4662
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4663
            "/ temporary fix Felix' bad string translation:
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  4664
            (aString startsWith:'§Header:') ifTrue:[
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  4665
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4666
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4667
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4668
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4669
                        autoFixHolder value ifFalse:[
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  4670
                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4671
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4672
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4673
                        (autoFixHolder value 
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  4674
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4675
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4676
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4677
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4678
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4679
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4680
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4681
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  4682
            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4683
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4684
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4685
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4686
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4687
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4688
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4689
                            Dialog information:'Attention: the CVS version string is corrupted (Umlaut remover-bug). Please fix it manually'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4690
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4691
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4692
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4693
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Umlaut remover-bug). Fix it?' withCRs bindWith:aClass name) ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4694
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4695
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4696
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4697
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4698
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4699
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4700
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4701
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4702
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4703
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4704
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4705
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4706
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4707
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4708
                            Dialog information:'Attention: the CVS version string is corrupted (Escaper-bug). Please fix it manually'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4709
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4710
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4711
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4712
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Escaper-bug).\\Fix it?' withCRs bindWith:aClass name) ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4713
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4714
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4715
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4716
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4717
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4718
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4719
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4720
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4721
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4722
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4723
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4724
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4725
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4726
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4727
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4728
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4729
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4730
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4731
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4732
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4733
revisionLogOf:clsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4734
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4735
    fileName:classFileName directory:packageDir module:moduleDir
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4736
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4737
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4738
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4739
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4740
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4741
     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
  4742
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4743
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4744
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4745
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4746
            #container          -> the RCS/CVS container file name 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4747
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4748
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4749
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4750
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4751
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4752
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4753
            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
  4754
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4755
              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
  4756
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4757
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4758
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4759
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4760
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4761
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4762
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4764
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4765
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4766
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4767
              #state                 -> the RCS state
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4768
              #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
  4769
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4770
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4771
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4772
            (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
  4773
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4774
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4775
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4776
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4777
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4778
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4779
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4780
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4781
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4782
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4783
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4784
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4785
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4786
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4787
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4788
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4789
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4790
        modulePath :=  moduleDir , '/' , packageDir. 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4791
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4792
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4793
        self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4794
            self createEntryFor:fullName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4795
                 module:moduleDir
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4796
                 in:(tempDir construct:modulePath) 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4797
                 revision:'1.1' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4798
                 date:'dummy' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4799
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4800
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4801
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4802
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4803
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4804
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4805
        (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
  4806
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4807
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4808
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4809
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4810
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4811
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4812
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4813
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4814
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4815
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4816
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4817
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4818
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4819
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4820
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4821
        headerOnly ifTrue:[
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  4822
            msg := 'Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4823
        ] ifFalse:[
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  4824
            msg := 'Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4825
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4826
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4827
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4828
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4829
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4830
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4831
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4832
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4833
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4834
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4835
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4836
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4837
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4838
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4839
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4840
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4841
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4842
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4843
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4844
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4845
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4846
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4847
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4848
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4849
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4850
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4852
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4853
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4854
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4855
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4856
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4857
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4858
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4859
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4860
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4861
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4862
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4863
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4864
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4865
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4866
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4867
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4868
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4869
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4870
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4871
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4872
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4873
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4874
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4875
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4876
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4877
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4878
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4879
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4880
                         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
  4881
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4882
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4883
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4884
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4885
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4886
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4887
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4888
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4889
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4890
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4891
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4892
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4893
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4894
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4895
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4896
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4897
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4898
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4899
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4900
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4901
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4902
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4903
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4904
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4905
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4906
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4907
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4908
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4909
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4910
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4911
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4912
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4913
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4914
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4915
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4916
                    "/ 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
  4917
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4918
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4919
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4920
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4921
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4922
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4923
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4925
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4926
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4927
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4928
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4929
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4930
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4931
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4932
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4933
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4934
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4935
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4936
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4937
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4938
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4939
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4940
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4941
        tempDir notNil ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4942
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4943
                ('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
  4944
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4945
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4946
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4947
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4948
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4949
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4950
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4951
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4952
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4953
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4954
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4955
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4956
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4957
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4958
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4959
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4960
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4961
    "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
  4962
    "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
  4963
    "Modified: / 05-02-2012 / 19:03:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4964
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4965
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4966
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4967
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4968
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4969
     each filled with:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4970
            #container          -> the RCS/CVS container file name 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4971
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4972
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4973
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4974
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4975
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4976
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4977
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4978
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4979
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4980
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4981
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4982
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4983
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4984
             -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
  4985
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4986
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4987
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4988
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4989
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4990
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4991
              #state                 -> the RCS state
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4992
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4993
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4994
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4995
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4996
            (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
  4997
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4998
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4999
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5000
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5001
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5002
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5003
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5004
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5005
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5006
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5007
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5008
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5009
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5010
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5011
        modulePath :=  moduleDir , '/' , packageDir. 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5012
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5013
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  5014
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5015
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5016
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5017
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5018
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5019
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5020
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5021
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5022
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5023
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5024
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5025
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5026
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5027
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5028
        headerOnly ifTrue:[
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  5029
            msg := 'Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5030
        ] ifFalse:[
3295
e98ab6c72ab1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3294
diff changeset
  5031
            msg := 'Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5032
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5033
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5034
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5035
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5036
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5037
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5038
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5039
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5040
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5041
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5042
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5043
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5044
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5045
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5046
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5047
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5048
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5049
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5050
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5051
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5052
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5053
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5054
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5055
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5056
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5057
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5058
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5059
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5060
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5061
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5062
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5063
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5064
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5065
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5066
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5067
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5068
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5069
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5070
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5071
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5072
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5073
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5074
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5075
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5076
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5077
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5078
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5079
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5080
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5081
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5082
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5083
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5084
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5085
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5086
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5087
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5088
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5089
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5090
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5091
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5092
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5093
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5094
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5095
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5096
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5097
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5098
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5099
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5100
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5101
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5102
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5103
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5104
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5105
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5106
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5107
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5108
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5109
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5110
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5111
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5112
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5113
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5114
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5115
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5116
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5117
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5118
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5119
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5120
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5121
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5122
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5123
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5124
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5125
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5126
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5127
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5128
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5129
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5130
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5131
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5132
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5133
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5134
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5135
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  5136
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5137
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5138
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5139
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5140
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5141
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5142
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5143
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5144
        tempDir notNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5145
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5146
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5147
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5148
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5149
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5150
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5151
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5152
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5153
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5154
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5155
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5156
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5157
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5158
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5159
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5160
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5161
    "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
  5162
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5163
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5164
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5165
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5166
    tempDir := nil.         "use the current directory"
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5167
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5168
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5169
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5170
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5171
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5172
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5173
    modulePath :=  module , '/' , packageDir. 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5174
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5175
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5176
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5177
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5178
        self activityNotification:('Fetching revision infos for %1%2'
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5179
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5180
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5181
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5182
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5183
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5184
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5185
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5186
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5187
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5188
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5189
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5190
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5191
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5192
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5193
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5194
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5195
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5196
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5197
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5198
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5199
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5200
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5201
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5202
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5203
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5204
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5205
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5206
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5207
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5208
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5209
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5210
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5211
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5212
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5213
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5214
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5215
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5216
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5217
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5218
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5219
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5220
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5221
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5222
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5223
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5224
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5225
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5226
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5227
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5228
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5229
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5230
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5231
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5232
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5233
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5234
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5235
    modulePath :=  module , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5236
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5237
    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
  5238
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5239
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5240
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5241
    [
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5242
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5243
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5244
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5245
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5246
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5247
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5248
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5249
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5250
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5251
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5252
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5253
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5254
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5255
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5256
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5257
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5258
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5259
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5260
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5261
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5262
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5263
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5264
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5265
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5266
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5267
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5268
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5269
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5270
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5271
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5272
    "Created: / 12-10-2006 / 10:12:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5273
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5274
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5275
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5276
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5277
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5278
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5279
     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
  5280
     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
  5281
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5282
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5283
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5284
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5285
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5286
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5287
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5288
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5289
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5290
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5291
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5292
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5293
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5294
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5295
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5296
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5297
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5298
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5299
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5300
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5301
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5302
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5303
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5304
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5305
     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
  5306
     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
  5307
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5308
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5309
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5310
    |pathes alreadyWarned|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5311
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5312
    alreadyWarned := 0.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5313
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5314
    pathes := aCollectionOfClasses 
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5315
                collect:[:cls | 
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5316
                    |info path answer|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5317
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5318
                    cls isLoaded ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5319
                        Transcript showCR:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5320
                        alreadyWarned == 0 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5321
                            Dialog warn:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5322
                            alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5323
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5324
                            alreadyWarned == 1 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5325
                                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
  5326
                                answer == nil ifTrue:[^ self].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5327
                                answer == true ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5328
                                    alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5329
                                ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5330
                            ] 
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5331
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5332
                        nil
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5333
                    ] ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5334
                        info := self sourceInfoOfClass:cls.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5335
                        info isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5336
                            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
  5337
                            nil
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5338
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5339
                            path := info at:#pathInRepository ifAbsent:nil.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5340
                            path isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5341
                                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
  5342
                            ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5343
                            path
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5344
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5345
                    ].
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5346
                ]
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5347
                thenSelect:[:path | path notNil].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5348
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5349
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5350
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5351
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5352
        pathes:pathes
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5353
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5354
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5355
     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
  5356
     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
  5357
     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
  5358
     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
  5359
     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
  5360
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5361
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5362
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5363
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5364
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  5365
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
  5366
    "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
  5367
     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
  5368
     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
  5369
     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
  5370
     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
  5371
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5372
     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
  5373
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5374
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5375
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5376
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5377
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5378
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5379
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5380
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5381
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5382
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5383
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5384
     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
  5385
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5386
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5387
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5388
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5389
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5390
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5391
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5392
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5393
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5394
     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
  5395
     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
  5396
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5397
     If filename is nil, the symbolicName for a whole package is set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5398
     If multiple pathes are given, the revision MUST be nil."
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5399
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5400
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5401
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5402
    symbolicName := (symbolicNameArg includes:Character space) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5403
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5404
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5405
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5406
    pathesInRepository size > 1 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5407
        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
  5408
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5409
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5410
    moduleDirs := pathesInRepository 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5411
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5412
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5413
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5414
    moduleDirs do:[:moduleDir |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5415
        |pathesInModule pathesInModuleAsArgument|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5416
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5417
        pathesInModule := pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5418
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5419
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5420
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5421
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5422
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5423
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5424
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5425
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5426
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5427
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5428
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5429
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5430
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5431
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5432
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5433
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5434
        pathesInModuleAsArgument := pathesInModule 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5435
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5436
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5437
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5438
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5439
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5440
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5441
                                        ].
1790
50c24ca2ae45 fix setting tags on more than one file
Stefan Vogel <sv@exept.de>
parents: 1788
diff changeset
  5442
        pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5443
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5444
        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
  5445
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5446
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5447
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5448
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5449
        result := self  
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5450
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathesInModuleAsArgument) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5451
                    module:moduleDir 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5452
                    inDirectory:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5453
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5454
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5455
                    errorTo:errorStream.
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5456
        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
  5457
        (result not or:[errorStream size ~~ 0]) ifTrue:[
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5458
            SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5459
        ] ifFalse:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5460
            (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5461
                SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5462
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5463
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5464
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5465
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5466
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5467
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5468
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5469
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5470
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5471
        setSymbolicName:'test1' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5472
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5473
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5474
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5475
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5476
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5477
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5478
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5479
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5480
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5481
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5482
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5483
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5484
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5485
        revision:0 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5486
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5487
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5488
                  '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
  5489
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5490
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5491
    "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
  5492
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5493
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5494
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5495
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5496
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5497
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5498
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5499
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5500
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5501
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5502
     This is much faster than revisionLog info (especially, if there are many revisions),
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5503
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5504
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5505
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5506
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5507
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5508
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5509
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5510
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5511
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5512
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5513
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5514
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5515
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5516
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5517
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5518
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5519
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5520
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5521
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5522
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5523
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5524
3813
04e40bdd7252 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3811
diff changeset
  5525
        msg := 'Fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5526
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5527
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5528
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5529
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5530
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5531
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5532
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5533
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5534
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5535
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5536
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5537
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5538
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5539
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5540
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5541
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5542
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5543
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5544
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5546
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5547
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5548
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5549
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5550
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5551
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5552
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5553
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5554
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5555
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5556
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5557
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5558
                ((line includesString:'warning')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5559
                and:[ (line includesString:'is not')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5560
                and:[ (line includesString:'pertinent') ]]) ifTrue:[
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5561
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5562
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5563
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5564
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5565
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5566
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5567
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5568
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5569
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5570
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5571
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5572
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5573
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5574
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5575
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5576
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5577
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5578
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5579
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5580
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5581
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5582
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5583
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5584
            ('CVSSourceCodeManager [warning]: no status for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5585
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5586
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5587
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5588
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5589
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5590
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5591
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5592
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5593
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5594
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5595
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5596
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5597
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5598
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5599
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5600
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5601
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5602
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5603
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5604
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5605
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5606
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5607
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5608
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5609
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5610
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5611
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5612
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5613
version
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5614
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5615
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5616
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5617
version_CVS
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5618
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5619
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5620
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  5621
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5622
CVSSourceCodeManager initialize!