CVSSourceCodeManager.st
author mawalch
Wed, 17 May 2017 12:52:38 +0200
changeset 4238 e3824d6ddfb7
parent 4233 277b4ea21e4c
child 4239 635990f888e1
permissions -rw-r--r--
#DOCUMENTATION by mawalch class: Change comment/format in: #asAntiChange
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
     1
"{ Encoding: utf8 }"
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
     2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
 COPYRIGHT (c) 1995 by Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     5
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    14
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    15
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    16
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    17
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    18
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    19
	instanceVariableNames:''
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    20
	classVariableNames:'AuthorMap CMD_checkout CVSCommandSemaphore CVSCommandTimeout
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    21
		CVSCommitOptions CVSExecutable CVSModuleRoots CVSRoot CVSTempDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    22
		CVSUpdateOptions DisabledModules RecentTags
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    23
		RecentlyCheckedModulesAndPackages RemoteCVS'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    24
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    25
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    26
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    27
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    28
VersionInfo subclass:#CVSVersionInfo
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
    29
	instanceVariableNames:'repositoryPathName timeZone changedLinesInfo'
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    30
	classVariableNames:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    31
	poolDictionaries:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    32
	privateIn:CVSSourceCodeManager
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    33
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    34
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    35
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    36
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    37
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    38
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    40
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    41
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    42
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    43
 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
    44
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    45
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    46
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    47
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    48
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    variable being set by a private.rc file).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    57
    Under that top, for each module (especially the stx module itself),
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    60
    If not specified otherwise, the module defaults to 'stx'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
        (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
    75
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
    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
    78
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    85
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    88
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    89
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    90
        - 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
    91
          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
    92
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    94
        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
    95
        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
    96
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    97
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    98
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    99
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
   100
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   105
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
                                        if false, disk access is used;
3948
mawalch
parents: 3931
diff changeset
   113
                                        files in CVSRoot must be accessible.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
"
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
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
        should acomplish this.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
        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
   183
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   191
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   192
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   193
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   194
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   195
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   199
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   200
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   201
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   202
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   203
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   204
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   205
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   206
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   207
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   208
exeptsPrivateSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   209
    "the actual stx repository as used within exept.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   210
     Only valid within exept"
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   211
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   212
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   213
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   214
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   215
exeptsPublicSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   216
    "the public repository, which is a read-only copy of the exept-internal repository.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   217
     Updated every night."
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   218
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   219
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   220
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   221
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   222
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   223
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   227
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   228
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   229
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   230
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
4047
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   237
    | s f top |
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   238
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   239
    CVSCommandSemaphore isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   240
        CVSCommandSemaphore := (Semaphore new:10) name:'Concurrent CVS Commands'.    "/ at most 10 cvs activities concurrently
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   241
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   242
    CVSCommitOptions isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   243
        CVSCommitOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   244
        CVSUpdateOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   245
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   246
    RemoteCVS isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   247
        RemoteCVS := true.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   248
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   250
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   251
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   252
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   253
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   254
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   256
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   259
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   260
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   261
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   262
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   263
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   264
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
    "/
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   272
    ((f := CVSRoot asFilename) isDirectory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   278
    DefaultManager isNil ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   279
        DefaultManager := self.
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   280
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   283
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   284
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
    "/ and updated/commited files are not removed.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   292
    "/ If you use a regular (make-) tree,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
        UseWorkTree := true.
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
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   314
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   315
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   316
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   317
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   318
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   319
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   320
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   321
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   322
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   323
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
    "set the global CVSROOT directory (i.e. the repositories name).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   328
     And reinitialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
    AbstractSourceCodeManager initialize.
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   333
    self initialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   334
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   335
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   336
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   338
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   339
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   340
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   341
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   342
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
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
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   345
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   346
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   347
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   348
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   349
    ((OperatingSystem getDomainName endsWith:'exept.de') or:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   350
     OperatingSystem getNetworkAddresses contains:[:eachSocketAddress| eachSocketAddress hostAddress startsWith: #[172 23 1]]]
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   351
    ) ifTrue:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   352
        self addExeptsPrivateRepositoryToModuleRoots.
3411
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
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
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
3848
2768cbd5b7f1 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3834
diff changeset
   462
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
3620
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
4102
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   472
    aString isEmpty ifTrue:[
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   473
        ^ self.
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   474
    ].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   475
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   476
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   477
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   478
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   479
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   480
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   481
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   482
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   483
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   484
    "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
   485
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   486
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   487
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   488
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   489
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   490
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   491
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   492
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   493
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   494
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   495
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   496
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   497
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   498
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   499
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   500
     the default cvsRoot (CVSRoot) will be used."
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
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   503
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   504
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   505
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   506
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   507
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   508
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   509
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   510
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   511
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   512
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   514
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   517
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   518
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   519
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   520
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   521
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   522
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   523
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   525
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   528
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   531
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   533
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   534
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   535
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   546
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   561
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   562
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   563
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   564
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   565
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   566
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   567
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   568
    "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
   569
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   570
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   571
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   572
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   573
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   574
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   575
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   576
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   577
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   578
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   579
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   583
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   584
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   585
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   586
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   588
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   589
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   590
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   591
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   592
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   593
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   594
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   595
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   596
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   597
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   599
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   600
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   601
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   602
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   603
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   604
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   605
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   606
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   607
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   608
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   609
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   610
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   611
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   612
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   613
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   614
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   615
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   616
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   617
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   618
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   619
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   620
     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
   621
     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
   622
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   623
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   624
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   625
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   626
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   627
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   628
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   629
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   630
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   631
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   632
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   633
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   634
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   635
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   636
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   637
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   638
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   639
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   640
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   641
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   642
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   643
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   644
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   645
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   646
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   647
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   648
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   665
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   750
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   753
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   761
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   762
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   766
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   769
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   770
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   771
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   772
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   773
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   777
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   780
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   781
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   782
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   784
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   790
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   791
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   792
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   797
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   804
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   805
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   807
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   808
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   811
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
        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
   813
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   815
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   816
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   817
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
     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
   824
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   828
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   830
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   831
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   832
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   833
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   834
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   835
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   836
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   837
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   838
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   839
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   840
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   841
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   842
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   845
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   852
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   853
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   854
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   855
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   856
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   857
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   858
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   859
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   860
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   861
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   862
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   863
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
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   866
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   867
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   868
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   869
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   870
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   871
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   872
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   873
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   874
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   875
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   876
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   877
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   878
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   880
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   881
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   882
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   883
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   884
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   885
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   886
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   887
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   888
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   889
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   892
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   893
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   895
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   897
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   899
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   901
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   903
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   905
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   906
                defaultContents notNil ifTrue:[
3949
0514468a25e4 #BUGFIX
mawalch
parents: 3948
diff changeset
   907
                    s nextPutAll:defaultContents.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   908
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   914
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   916
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   943
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   945
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   951
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   955
    "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
   956
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   957
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   961
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   962
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   963
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   966
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   967
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   973
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   974
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   976
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   978
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   984
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   987
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
     if dir ~= nil, execute command in that directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
   997
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1000
    ^ self
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1001
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1003
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1005
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
  1006
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1007
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1008
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1009
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1010
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1011
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1012
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1013
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1014
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1015
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
  1016
    "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
  1017
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1018
     The doLog argument, if false suppresses a logEntry to be added
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1019
     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
  1020
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1021
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1022
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1023
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1024
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1025
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1026
        pipe:false
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1027
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1028
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1029
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1030
    "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
  1031
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1032
    "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
  1033
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1034
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1035
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1036
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1037
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1038
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1039
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1040
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1041
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1042
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1043
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1044
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1045
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1046
        pipe:doPipe
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1047
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1048
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1049
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1050
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1051
    "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
  1052
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1053
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1054
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1055
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1056
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
  1057
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1058
     execute command in the dirArg directory (or the current directory if dirArg is nil).
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1059
     The doLog argument, if false suppresses a logEntry to be added
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1060
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1061
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1062
    |command cvsRoot rslt ok pathOfDir errorString osProcess|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1063
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1064
    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
  1065
        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
  1066
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1067
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1068
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1069
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1070
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1071
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1072
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1073
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1074
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1075
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1076
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1077
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1078
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1079
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1080
    "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
  1081
    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
  1082
        (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
  1083
            (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
  1084
                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
  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
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1087
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1088
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1089
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1090
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1091
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1092
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1093
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1094
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1095
    doPipe ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1096
        rslt := PipeStream
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1097
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1098
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1099
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1100
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1101
    ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1102
        osProcess := OSProcess new
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1103
                        command:command;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1104
                        outStream:outStreamOrNil;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1105
                        errorStream:outStreamOrNil;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1106
                        directory:pathOfDir.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1107
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1108
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1109
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1110
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1111
            "/ execute the command in this thread, as opposed to the code below.
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1112
            ok := rslt := osProcess execute.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1113
        ] ifTrue:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1114
            CVSCommandSemaphore critical:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1115
                |errOut done|
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1116
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1117
                errOut := WriteStream on:''.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1118
                osProcess errorStream:errOut.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1119
                ok := osProcess startProcess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1120
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1121
                [
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1122
                    done := true.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1123
                    (osProcess waitUntilFinishedWithTimeout:self cvsCommandTimeout) isNil ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1124
                        (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1125
                                                bindWith:self cvsCommandTimeout with:command)) 
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1126
                        ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1127
                            done := false
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1128
                        ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1129
                            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1130
                            osProcess terminate.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1131
                            ok := false.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1132
                            errorString := 'CVS command timeout'.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1133
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1134
                    ] ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1135
                        ok := rslt := osProcess finishedWithSuccess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1136
                        ok ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1137
                            errorString := errOut contents.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1138
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1139
                    ]
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1140
                ] doUntil:[done].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1141
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1142
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1143
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1144
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1145
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1146
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1147
            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
  1148
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1149
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1150
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1151
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1152
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1153
    "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
  1154
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1155
    "Created: / 28-02-2012 / 17:30:34 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1156
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1157
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1158
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1159
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1160
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1161
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1162
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1163
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1164
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1165
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1166
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1167
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1168
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1169
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1170
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1171
                s notNil ifTrue:[
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1172
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1173
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1174
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1175
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1176
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1177
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1178
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1179
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1180
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1181
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1184
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1189
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1191
                    fileName := revisionUsed := nil.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1192
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1193
            ].
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1194
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1195
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1196
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1198
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1199
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1202
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1203
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1208
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1209
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1210
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1211
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1212
                s notNil ifTrue:[
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1213
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1214
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1215
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1216
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1217
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1218
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1219
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1220
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1221
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1222
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1223
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1224
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1225
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1226
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1230
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
                    fileName := revisionUsed := nil.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1235
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1236
            ].
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1239
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1241
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1242
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1243
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1244
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1245
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1246
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1247
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1248
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1249
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1250
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1251
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1252
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1253
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1254
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1255
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1256
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1257
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1258
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1259
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1260
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1261
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1262
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1268
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1272
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1281
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1290
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1291
    "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
  1292
     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
  1293
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1294
     The returned information is a CVSVersionInfo object (used to be an IdentityDictionary)
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1295
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1296
              #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
  1297
              #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
  1298
              #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
  1299
              #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
  1300
              #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
  1301
              #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
  1302
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1303
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1304
    |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
  1305
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1306
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1307
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1308
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1309
    [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
  1310
        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
  1311
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1312
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1313
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1314
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1315
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1316
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1317
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1318
        record := CVSVersionInfo "IdentityDictionary" new.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1319
        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
  1320
        "/ 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
  1321
        (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
  1322
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1323
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1324
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1325
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1326
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1327
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1328
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1329
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1330
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1331
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1332
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1333
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1334
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1335
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1336
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1337
        "first revision does not have a 'lines:' entry"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1338
        (record at:#numberOfChangedLines ifAbsent:[nil]) isNil ifTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1339
            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
  1340
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1341
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1342
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1343
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1344
        [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
  1345
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1346
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1348
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1349
                    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
  1350
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1351
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1352
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1353
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1354
                    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
  1355
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1356
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1357
            ]
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
        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
  1360
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1361
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1362
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1363
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1364
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1365
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1366
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1367
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1368
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1369
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1370
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1371
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1372
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1373
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1374
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1375
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1376
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1377
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1378
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1379
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1380
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1381
    "/
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
  1382
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1400
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1405
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1411
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1412
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1415
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1422
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1425
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1426
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1427
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1428
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1429
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1432
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1433
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1434
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1435
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1436
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1439
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1440
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1452
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1466
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1467
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1468
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1469
     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
  1470
     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
  1471
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1472
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1473
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1474
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1475
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1476
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1477
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1478
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1479
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1480
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1481
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1482
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1483
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1484
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1485
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1486
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1487
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1488
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1489
             "/ already a modified class
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1490
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1491
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1492
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1493
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1494
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1495
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1496
    ].
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
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1500
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1503
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1504
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1506
    "/ originalVersionString (Do not mind the additional space between $ and Header:. This is to prevent keyword substitution.)
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1507
    "/      '$ Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v 1.4 2013/01/24 10:14:27 vrany Exp $'
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1513
    "/      'Exp $'
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1514
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'.
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1515
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1516
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1517
    "Modified (comment): / 13-04-2017 / 19:29:22 / mawalch"
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1518
!
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1520
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1521
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1522
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1523
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1524
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1525
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1526
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1527
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1528
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1529
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1530
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1531
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1532
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1533
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1534
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1535
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1536
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1539
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1540
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1542
             "/ already a modified class
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1544
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1549
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1553
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1554
    "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
  1555
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1556
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1557
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1558
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1559
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1560
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1563
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1564
2449
vrany
parents: 2403
diff changeset
  1565
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1566
vrany
parents: 2403
diff changeset
  1567
    "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
  1568
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1569
vrany
parents: 2403
diff changeset
  1570
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1571
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1572
vrany
parents: 2403
diff changeset
  1573
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1574
!
vrany
parents: 2403
diff changeset
  1575
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1576
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1577
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1578
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1579
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1580
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1581
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1582
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1583
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1584
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1585
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1586
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1587
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1588
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1589
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1590
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1591
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1592
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1593
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1594
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1595
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1596
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1597
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1598
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1599
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1600
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1601
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1602
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1603
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1604
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1605
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1606
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1607
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1608
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1609
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1610
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1611
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1612
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1613
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1614
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1615
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1616
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1617
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1618
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1619
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1620
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1621
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1622
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1623
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1624
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1625
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1626
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1627
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1628
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1629
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1630
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1631
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1632
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1633
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1634
    |tempdir cmd checkoutName logMsg revision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1635
     cmdOut whatHappened idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1636
     newRevision  msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1637
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1638
     editor checkInRepaired didAccept emphasizedText repairedText out
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1639
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1640
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1641
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1642
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1643
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1644
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1645
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1646
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1647
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1648
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1649
        modulePath := moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1650
    ] ifFalse:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1651
        modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1652
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1653
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1655
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1656
        "/ a new file ...
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1657
        ^ self
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1658
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1659
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1661
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1662
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1663
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1666
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1667
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1668
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1669
        "/ 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
  1670
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1671
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1672
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1673
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1674
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1675
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1676
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1677
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1678
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1679
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1681
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1682
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1683
        "/ 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
  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
        "/ correct our current time, so that converting it will give us UTC
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1687
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1688
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1689
        self createEntryFor:checkoutName
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1690
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1691
             in:(tempdir construct:modulePath)
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1692
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1693
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1694
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1695
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1696
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1697
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1698
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1699
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1700
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1701
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1702
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
        ] do:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1704
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1705
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1708
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1709
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1713
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  1714
        self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
3264
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
        cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1717
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1718
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1719
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1720
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1721
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1722
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1723
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1724
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1725
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1726
        ] ifTrue:[
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
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1729
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1730
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1731
            "/   C xxx   -> a conflict occurred and the differences have been merged into the source
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1732
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1733
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1734
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1735
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1736
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1737
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1739
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
            "/ no change
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1744
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1749
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1750
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1751
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1752
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1753
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1754
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1755
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1756
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1758
                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
  1759
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
            changeLog notNil ifTrue:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1761
                |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1762
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1763
                s := CharacterWriteStream new.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1768
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1770
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1771
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1772
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1774
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1775
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1776
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1777
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1779
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1780
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1781
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
                            and:[(line startsWith:'Merging') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1783
                            and:[line size > 0]]]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1784
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1786
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
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
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1790
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1791
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1792
            or:[changeLog isNil
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1795
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1796
                "/
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1797
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1798
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1799
                | mySource mergedSource |
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
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1802
                "/ 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
  1803
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1804
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1805
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1806
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1807
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1808
                mySource := someText.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1809
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
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
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1812
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1813
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1814
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1815
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1816
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1817
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1818
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1819
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1821
                                   abortable:false
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1822
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1823
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1824
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1826
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1827
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1828
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1829
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1830
Although this is a nice feature, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1831
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1832
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1833
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1834
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1835
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1836
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1838
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1839
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1840
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1841
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1842
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1843
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1844
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1845
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1846
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1847
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1848
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1849
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1850
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1851
                                label:'merged version'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1852
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1853
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1854
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1855
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1856
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1860
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1861
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1862
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1863
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1864
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1865
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1866
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1867
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1868
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1869
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1870
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1871
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1872
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1873
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1874
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
"/                ].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1878
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1879
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1880
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1881
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1882
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1883
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1884
                "/ 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
  1885
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1886
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1887
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1888
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1889
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1894
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1895
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1896
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1897
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1898
                     message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1899
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1900
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1901
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1902
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1903
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1904
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1905
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1906
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1907
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1908
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1909
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1910
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1911
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1912
                        label:'newest repository version'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1913
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1914
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1915
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1916
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1917
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1918
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1919
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1920
                    "/
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 merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
                    "/ ... accept will check it in.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1926
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1927
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1928
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1929
                                emphasizeMergedDiff3Text:emphasizedText
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1930
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1935
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1936
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1937
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1938
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1939
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1940
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1941
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1942
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1943
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1944
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1945
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1946
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1947
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1949
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1950
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1953
                        editor := RCSConflictEditTextView
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1954
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1955
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1956
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1957
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1958
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1959
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1960
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1961
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1962
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1963
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1964
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1965
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1966
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1967
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1968
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1969
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  1971
                            (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
  1972
                                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
  1973
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1974
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1976
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1977
                    ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1980
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1981
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1982
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1983
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1984
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1985
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1986
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1987
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1988
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1989
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1990
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1991
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1992
                checkInRepaired ifTrue:[
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1993
                    Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1994
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1995
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1996
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1997
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1998
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1999
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2000
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2001
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2002
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2003
                    "/ a newer version.
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2006
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2007
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2008
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2009
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2010
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2011
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2012
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2013
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2014
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2015
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2016
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2017
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2019
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2020
            ]
3264
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2023
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2024
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2025
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2026
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2027
        self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
3264
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
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2030
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2031
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2032
            "/ save the log message into another tempFile ...
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2033
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2034
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2035
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2036
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2037
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2038
            s close.
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
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2041
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2042
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2043
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2044
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2045
        ] ifTrue:[
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
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2048
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2049
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2050
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2051
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2052
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2054
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2055
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2057
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2058
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2059
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2060
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
                whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2064
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2066
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2067
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2068
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2069
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2070
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2071
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2072
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2073
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2075
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2076
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2077
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2078
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2079
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2080
            whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2081
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2082
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2083
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2084
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2085
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2086
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2087
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2088
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2089
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2090
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2091
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2092
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2093
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2096
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
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
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2101
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2102
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2104
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2105
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2106
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2107
    "Modified: / 12-11-2010 / 11:04:10 / cg"
2823
70f154c6ee66 changed: #checkin:text:directory:module:logMessage:force:
sr
parents: 2822
diff changeset
  2108
    "Modified: / 19-04-2012 / 14:18:24 / sr"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2109
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2110
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2111
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2112
    ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg asBranch:nil
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2113
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2114
    "Created: / 11-09-1996 / 16:16:11 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2115
    "Modified: / 31-07-2013 / 18:07:53 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2116
    "Modified: / 29-03-2017 / 18:21:23 / stefan"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2117
!
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2118
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2119
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg asBranch:branchTag
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2120
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2121
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2122
     instead, the code is checked in as given (Dangerous).
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2123
     Return true if ok, false if not.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2124
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2125
     If branchTag is notNil, the class is checked in on the branch if it already exists, or a branch for this tag is created.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2126
     (branch support does not work yet!!)"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2127
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2128
    |tempdir cmd checkoutName logMsg classRevision newestRevision cmdOut whatHappened s entry idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2129
     newRevision newString binRevision className msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2130
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2131
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2132
     emSep force conflictResolvedManually revisionOption|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2136
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2137
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2138
        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
  2139
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2140
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2141
    classRevision := cls revisionOfManager:self.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2142
    (classRevision notNil and:[classRevision endsWith:$m]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2143
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2145
        "/ must use the original revision string.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2146
        classRevision := classRevision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2147
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2148
    binRevision := cls binaryRevision.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2149
    (binRevision notNil and:[classRevision ~= binRevision]) ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2150
        Transcript showCR:('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (classRevision ? '?'))
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2153
    classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2154
        "there is no version method. Get the version from the repository"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2155
        classRevision := newestRevision := self newestRevisionOf:cls.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2156
        classRevision isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
            force ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2158
                classRevision := newestRevision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2159
            ].
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2160
            classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2161
                classRevision := '1.0'   "/ initial checkin
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2162
            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2163
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2164
            classRevision == #deleted ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2165
                classRevision := '0'     "/ to force cvs-adding, which resurrects the file from the Attic
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2166
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2167
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2168
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2169
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2170
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2171
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2172
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2173
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2174
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2175
            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
  2176
            ^ false.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2177
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2178
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2181
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2182
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2183
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2188
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2195
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2196
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2197
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2198
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2199
    [ "ensure protected block"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2200
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2201
        "/ next, create CVS/Entries and CVS/Repository with revision information of current revision
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2202
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2203
        packageDir isEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2204
            modulePath := moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2205
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2206
            modulePath :=  moduleDir , '/' , packageDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2207
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2208
        checkoutName :=  modulePath , '/' , classFileName.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2209
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2210
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2211
        "/ correct our current time, so that converting it will give us UTC
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2212
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2213
        time := UtcTimestamp now subtractSeconds:1.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2214
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2215
        self createEntryFor:checkoutName
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2216
             module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2217
             in:(tempdir construct:modulePath)
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2218
             revision:classRevision
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2219
             date:(self cvsTimeString:time)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2220
             special:''
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2221
             overwrite:true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2222
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2223
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2224
        "/ copy-over our current version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2225
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2226
        Error handle:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2227
            self reportError:'cannot copy-over filedOut class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2228
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2229
        ] do:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2230
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2231
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2232
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2233
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2234
        "/ synchronize i.e. merge in any changes
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2235
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2236
        self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2237
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2238
        revisionOption := ''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2239
        branchTag notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2240
            revisionOption := '-r ', branchTag.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2241
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2242
            (classRevision occurrencesOf:$.) > 2 ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2243
                "must be a branch, compare with branch revision"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2244
                revisionOption := '-r ', classRevision copyUpToLast:$..
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2245
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2246
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2247
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2248
        cmd := 'update %1 %4 %2 >"%3"'
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2249
                    bindWith:CVSUpdateOptions
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2250
                    with:classFileName
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2251
                    with:cmdOut name
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2252
                    with:revisionOption.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2253
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2254
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2255
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2256
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2257
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2258
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2259
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2260
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2261
                    "/ no container
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2262
                    "/ someone fiddled around with repository ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2263
                    (cls binaryRevision notNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2264
                        (Dialog confirm:('Someone seems to have removed the source container for ',cls name,'\\Force new checkin ?') withCRs)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2265
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2266
                            cls setBinaryRevision:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2267
                            ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force asBranch:branchTag.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2268
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2269
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2270
                    (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)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2271
                    ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2272
                        ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2273
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2274
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2275
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2276
                "/ is the version correct ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2277
                newestRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2278
                    newestRevision := self newestRevisionOf:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2279
                    newestRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2280
                        (Dialog confirm:('The source container for ',cls name allBold,' seems corrupted. Proceed?' withCRs)) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2281
                            ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2282
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2283
                        ^ self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2284
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2285
                            source:sourceFileName logMessage:logMessage force:true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2286
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2287
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2288
"/            revision > newestRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2289
"/                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)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2290
"/                ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2291
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2292
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2293
"/                    ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2294
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2295
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2296
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2297
"/            self reportError:('cannot merge current source with repository version (failed to execute: ',cmd,')').
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2298
"/            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2299
                "/ if we arrive here, proceed as if merged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2300
                whatHappened := 'M initial'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2301
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2302
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2303
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2304
            "/ check what happened - the contents of the cmdOut file may be:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2305
            "/   empty   -> nothing changed
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2306
            "/   M xxx   -> merged-in changes from other users
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2307
            "/   C xxx   -> a conflict occurred and the differences have been merged into the source
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2308
            "/              needs special action
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2309
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2310
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2311
                whatHappened := cmdOut contentsAsString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2312
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2313
                self breakPoint:#cg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2314
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2315
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2316
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2317
        (whatHappened isEmptyOrNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2318
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2319
            "/ no change
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2320
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2321
            Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2322
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2323
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2324
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2325
"/                (self confirm:('Nothing changed in %1 (repository unchanged).\\Remove entries from changeSet ?' bindWith:className) withCRs) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2326
"/                    ChangeSet current condenseChangesForClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2327
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2328
"/            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2329
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2330
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2331
                self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2332
            ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2333
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2334
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2335
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2336
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2337
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2338
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2339
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2340
                    newString isEmptyOrNil ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2341
                        'CVSSourceCodeManager [error]: missing revisionString' errorPrintCR
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2342
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2343
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2344
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2345
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2346
                        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2347
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2348
                        ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2349
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2350
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2351
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2352
            ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2353
        ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2354
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2355
        Verbose == true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2356
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2357
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2358
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2359
        force ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2360
            |nextRevision|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2361
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2362
            classRevision notNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2363
                nextRevision := self revisionAfter:classRevision.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2364
            ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2365
            changeLog := self revisionLogOf:cls fromRevision:nextRevision toRevision:nil.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2366
            changeLog notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2367
                s := CharacterWriteStream on:''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2368
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2369
                changesAsLogged := s contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2370
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2371
                "/ mhmh - that should not happen
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2372
                changesAsLogged := ''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2373
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2374
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2375
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2376
        didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2377
        conflictResolvedManually := checkInRepaired := checkInNew := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2378
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2379
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2380
        "/ cvs above rel10 returns a multiline info ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2381
        "/ we have to extract the one line which states what happened.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2382
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2383
        whatHappened := whatHappened asCollectionOfLines reject:[:line |
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2384
                            line isEmpty
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2385
                            or:[(line startsWith:'RCS file')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2386
                            or:[(line startsWith:'retrieving')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2387
                            or:[(line startsWith:'Merging')]]]
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2388
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2389
        whatHappened := whatHappened asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2390
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2391
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2392
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2393
            "/ merged in changes / resurrected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2394
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2395
            (force
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2396
             or:[changeLog isNil
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2397
             or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2398
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2399
                "/ pretty good - nothing has changed in the meanwhile
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2400
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2401
                Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2)...' bindWith:className with:modulePath).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2402
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2403
                |mySource mergedSource |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2404
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2405
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2406
                "/ someone else has changed things in the meanwhile, but there is no conflict
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2407
                "/ and version have been merged.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2408
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2409
                didMerge := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2410
                changesAsLogged := changesAsLogged asCollectionOfLines.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2411
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2412
                s := CharacterWriteStream new.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2413
                self fileOutSourceCodeOf:cls on:s.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2414
                mySource := s contents.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2415
                mergedSource := (tempdir construct:checkoutName) readStream contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2416
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2417
                mySource = mergedSource ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2418
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2419
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2420
I have merged your version with the newest repository version,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2421
and found no differences between the result and your current version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2422
(i.e. your version seemed up-to-date).'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2423
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2424
                    self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2425
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2426
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2427
                                   abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2428
                                   option:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2429
                    didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2430
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2431
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2432
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2433
If you continue, your new changes (based upon rev. ' , classRevision printString , ') will be MERGED
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2434
into the newest revision. This will combine the other version with your changes
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2435
into a new common revision which may be different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2436
Although this is a nice feature, it may fail to create the expected result in certain situations.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2437
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2438
You should carefully check the result - by comparing the current version with the
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2439
most recent version in the repository. If that does not contain an acceptable version,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2440
change methods as required and check in again.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2441
Be aware, that after that, the actual repository version is different from your current classes,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2442
and you should update your class from the repository.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2443
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2444
Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2445
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2446
                    answer := self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2447
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2448
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2449
                                   abortable:true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2450
                                   option:'Stop - see first'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2451
                                   option2:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2452
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2453
                    answer == #option2 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2454
                        (Dialog confirm:'Are you certain that you want to suppress a merge and force your code to be checked in ?')
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2455
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2456
                            s := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2457
                            self fileOutSourceCodeOf: cls on:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2458
                            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2459
                            answer := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2460
                        ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2461
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2462
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2463
                    answer ~~ true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2464
                        answer == #option ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2465
                            DiffCodeView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2466
                                openOn:mySource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2467
                                label:'current version'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2468
                                and:mergedSource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2469
                                label:'merged version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2470
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2471
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2472
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2473
                        ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2474
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2475
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2476
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2477
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2478
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2479
"/' , changesAsLogged , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2480
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2481
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2482
"/into the newest revision. This will combine the other version with your changes
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2483
"/into a new common revision which is different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2484
"/Although convenient, it may fail to create the expected result in certain situations.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2485
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2486
"/You should carefully check the result - by comparing the current version with the
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2487
"/most recent version in the repository. If that does not contain an acceptable version,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2488
"/change methods as required and check in again. Be aware, that the actual repository version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2489
"/is different from your current classes.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2490
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2491
"/Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2492
"/                (self confirm:msg) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2493
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2494
"/                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2495
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2496
                Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2497
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2498
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2499
            (whatHappened startsWith:'C ') ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2500
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2501
                "/ conflict; someone else checked in something in the meanwhile,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2502
                "/ and there is a conflict between this version and the checked in version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2503
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2504
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2505
                changesAsLogged := changesAsLogged asCollectionOfLines.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2506
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2507
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2508
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2509
Your new changes (based upon rev. ' , classRevision printString , ') CONFLICT with those changes.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2510
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2511
You should fix things by comparing your class with the most recent repository version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2512
and change your methods avoiding conflicts. Then checkin again.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2513
'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2514
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2515
                answer := self checkinTroubleDialog:'Version conflict'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2516
                     message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2517
                     log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2518
                     abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2519
                     option:'Show conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2520
                     option2:'Resolve conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2521
                     option3:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2522
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2523
                answer == #option ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2524
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2525
                    "/ show conflicts in a 3-way DiffTextView ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2526
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2527
                    Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2528
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2529
                        label:'your version (checkin attempt)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2530
                        label:'original (base version)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2531
                        label:'newest repository version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2532
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2533
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2534
                answer == #option2 ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2535
                    |diffComment|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2536
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2537
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2538
                    "/ allow checkin of repair version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2539
                    "/ this is error prone ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2540
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2541
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2542
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2543
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2544
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2545
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2546
                    emSep := (Array with:(#color->Color black)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2547
                                 with:(#backgroundColor->Color green)).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2548
                    emphasizedText := Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2549
                                emphasizeMergedDiff3Text:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2550
                                emphasize1:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2551
                                                  with:(#backgroundColor->Color blue))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2552
                                emphasize2:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2553
                                                  with:(#backgroundColor->Color red))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2554
                                emphasizeSep:emSep.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2555
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2556
                    diffComment :=
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2557
'"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2558
"/ This text contains your current versions code (blue)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2559
"/ merged with the conflicting code as found in the repository (red) which resulted
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2560
"/ from some other checkin.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2561
"/ Each such conflict is surrounded by green text (like this paragraph).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2562
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2563
"/ Please have a look at ALL the conflicts and fix things as appropriate.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2564
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2565
"/ unless no more green parts are present. This includes this comment at the top.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2566
"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2567
'.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2568
                    diffComment := (Text string:diffComment emphasis:emSep) asStringCollection.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2569
                    emphasizedText := diffComment , emphasizedText.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2570
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2571
                    didAccept := false. checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2572
                    [didAccept not and:[checkInRepaired]] whileTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2573
                        editor := RCSConflictEditTextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2574
                                    setupWith:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2575
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2576
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2577
                        editor acceptAction:[:dummy |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2578
                            repairedText := editor list.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2579
                            didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2580
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2581
                        didAccept := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2582
                        editor topView openModal.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2583
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2584
                        didAccept ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2585
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2586
                            ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2587
                                checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2588
                            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2589
                        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2590
                            "/ check if all green-stuff (separators) have been removed
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2591
                            (repairedText findFirst:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ~~ 0 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2592
                                self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2593
                                didAccept := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2594
                            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2595
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2596
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2597
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2598
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2599
                    checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2600
                        [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2601
                            out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2602
                            out nextPutAll:(repairedText asString string).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2603
                            didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2604
                            out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2605
                        ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2606
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2607
                            checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2608
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2609
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2610
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2611
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2612
                answer == #option3 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2613
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2614
                    "/ force checkin of new version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2615
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2616
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2617
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2618
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2619
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2620
                    [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2621
                        out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2622
                        self fileOutSourceCodeOf: cls on:out.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2623
                        out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2624
                        didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2625
                        checkInNew := checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2626
                    ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2627
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2628
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2629
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2630
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2631
                checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2632
                    checkInNew ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2633
                        Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (force)...' bindWith:className with:modulePath).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2634
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2635
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2636
                        Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2637
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2638
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2639
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2640
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2641
                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2642
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2643
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2644
                ((whatHappened startsWith:'U ')
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2645
                 or:[whatHappened startsWith:'P ']) ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2646
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2647
                    "/ nothing changed here, but the repository already contains
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2648
                    "/ a newer version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2649
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2650
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2651
                    self information:'nothing changed in your ''' , className , ''';
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2652
but repository already contains a newer version (repository unchanged).'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2653
                    ^ true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2654
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2655
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2656
                    "/ unexpected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2657
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2658
                    self warn:'unexpected message from CVS:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2659
' , whatHappened , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2660
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2661
No checkin performed.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2662
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2663
                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2664
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2665
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2666
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2667
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2668
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2669
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2670
        "/ now check it in again
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2671
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2672
        self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2673
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2674
        logMsg := logMsg replChar:$" withString:'\"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2675
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2676
        OperatingSystem isUNIXlike ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2677
            "/ save the log message into another tempFile ...
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2678
            s := FileStream newTemporaryIn:tempdir.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2679
            s nextPutAll:logMsg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2680
            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2681
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2682
            cmd := 'commit -F "', s fileName baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2683
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2684
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2685
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2686
            "/ CVS V1.9.16 to stdout.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2687
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2688
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2689
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2690
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2691
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2692
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2693
            inDirectory:tempdir name
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2694
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2695
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2696
                whatHappened := cmdOut contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2697
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2698
                whatHappened := '<< no message >>'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2699
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2700
            self warn:'The following problem was reported by cvs:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2701
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2702
' , whatHappened , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2703
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2704
The class has NOT been checked into the repository.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2705
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2706
            self reportError:'cannot checkin modified class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2707
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2708
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2709
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2710
            whatHappened := cmdOut contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2711
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2712
            whatHappened := nil
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2713
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2714
    ] ensure:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2715
        OsError handle:[:ex |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2717
                        bindWith:ex description).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2718
            ex proceed.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2719
        ] do:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2720
            tempdir notNil ifTrue:[ tempdir recursiveRemove ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2721
            cmdOut notNil ifTrue:[ cmdOut remove ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2722
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2723
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2724
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2725
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2726
    "/ fetch the new revision nr as found in the commit commands output
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2727
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2728
    (whatHappened isEmptyOrNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2729
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2730
    ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2731
        whatHappened := whatHappened asCollectionOfLines.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2732
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2733
        idx == 0 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2734
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2735
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2736
            l := whatHappened at:idx.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2737
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2738
        ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2739
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2740
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2741
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2742
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2743
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2744
    "/   this makes everyone here believe, that the incore version of the class is based upon
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2745
    "/   the newly checked in version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2746
    "/   (however, the binaryRevision must remain as it is - we will need it to fetch the sourceCode
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2747
    "/    correctly for all unchanged methodss)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2748
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2749
    "/ if there was a merge (i.e. the repository now contains a merge of the current and some
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2750
    "/ other version):
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2751
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2752
    "/    and add a 'm' (for merged).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2753
    "/    If we later checkin again, the new checkin will be again based on the current revision
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2754
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2755
    newRevision notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2756
        (didMerge or:[conflictResolvedManually]) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2757
            "/ new code:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2758
            cls revisionString notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2759
                newRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2760
                    'CVSSourceCodeManager [error]: got no valid revisionString (class checked in, but no valid revision returned)' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2761
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2762
                    newString := self updatedRevisionStringOf:cls forRevision:newRevision andUser:OperatingSystem getLoginName with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2763
                    newString isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2764
                        'CVSSourceCodeManager [error]: failed to update revisionString (class checked in, but no revision method)' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2765
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2766
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2767
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2768
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2769
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2770
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2771
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2772
                self activityNotification:'Done.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2773
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2774
                self activityNotification:'CVS: Fetch new revision number of ', cls name.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2775
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2776
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2777
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2778
                    force ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2779
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2780
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2781
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2782
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2783
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2784
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2785
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2786
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2787
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2788
                    self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2789
                    cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2790
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2791
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2792
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2793
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2794
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2795
            "/ If the conflict was resolved manually, do NOT update the revision method
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2796
            "/ (to get a new conflict in the next check-in)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2797
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2798
            "/ If there was a merge, update the revision method adding an 'm'"
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2799
            didMerge ifTrue: [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2800
                newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2801
                newString notNil ifTrue:[ self updateVersionMethodOf:cls for:newString ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2802
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2803
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2804
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2805
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2806
    Class addChangeRecordForClassCheckIn:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2807
    self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2808
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2809
    conflictResolvedManually ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2810
        (Dialog
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2811
            confirm:'Now the repository contains a merge between your and the other changes.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2812
However, the class in your image does NOT contain the other changes.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2813
This will lead to more conflict-resolving whenever you check this class in again later,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2814
unless you load the newest (merged) version of the class from the repository.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2815
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2816
I recommend doing this as soon as possible via your browser''s checkout function.'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2817
            title:'Code Merged'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2818
            yesLabel:'OK' noLabel:'Update (Load Merged Code)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2819
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2820
            self utilities
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2821
                checkoutClass:cls
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2822
                askForRevision:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2823
                askForMerge:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2824
                askForConfirmation:false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2825
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2826
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2827
    ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2828
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2829
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2830
     SourceCodeManager checkinClass:Array logMessage:'testing only'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2831
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2832
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2833
    "Created: / 13-03-2017 / 15:38:19 / stefan"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2834
    "Modified: / 31-03-2017 / 15:42:32 / stefan"
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2835
!
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2836
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2837
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2841
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2842
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2843
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2844
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2845
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2846
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2848
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2849
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2850
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2851
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2852
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2853
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2854
    self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2855
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2856
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2857
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2858
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2859
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2860
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2861
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2862
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2863
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2864
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2865
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2866
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2867
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2868
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2869
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2870
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2871
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2872
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2873
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2874
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2875
            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
  2876
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2877
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2878
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2879
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2881
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2882
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2883
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2884
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2885
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2887
    "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
  2888
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
3866
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2891
getSourceStreamFor:aClass revision:aRevisionStringOrNil
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2892
    "extract a classes source code and return an open readStream on it.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2893
     A revision of nil selects the current (in image) revision.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2894
     The classes source code is extracted using the revision and the sourceCodeInfo,
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2895
     which itself is extracted from the classes packageString."
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2896
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2897
    |cacheIt|
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2898
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2899
    "/ never cache symbolic versions
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2900
    cacheIt := (aRevisionStringOrNil isNil or:[ aRevisionStringOrNil first isDigit ]).
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2901
    ^ self getSourceStreamFor:aClass revision:aRevisionStringOrNil cache:cacheIt
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2902
!
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2903
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2904
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2905
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2906
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2907
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2910
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2912
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2914
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2915
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2916
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2923
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2925
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2928
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2929
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2930
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2932
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2934
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2936
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2938
    ].
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2939
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2940
        fullName := moduleDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2941
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2942
        fullName := moduleDir , '/' , packageDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2943
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
        fullName := fullName , '.st'.
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
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2949
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2952
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2953
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2954
    "/ 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
  2955
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2956
    "/ 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
  2957
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2958
    "/ (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
  2959
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2960
   (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
  2961
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2962
            ('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
  2963
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2964
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2965
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2966
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2967
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2968
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2969
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2970
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2974
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2975
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2976
    "/ 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
  2977
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2978
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2979
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2980
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2981
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2982
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2983
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2984
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2985
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2986
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2987
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2988
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2989
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2990
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2991
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2992
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2993
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2994
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2999
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3000
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3001
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3002
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3003
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3004
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
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
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3007
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3008
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3009
            revMsg := ''.
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
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3012
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3013
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3015
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3016
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3017
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3018
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3019
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3020
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3021
        self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3022
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3023
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3024
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3025
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3026
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3027
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3028
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3029
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3030
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3031
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3032
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3033
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3034
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3035
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3036
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3037
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3038
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3039
"/        "/ 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
  3040
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3041
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3042
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3043
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3044
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3045
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3046
"/            ('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
  3047
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3048
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3049
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3050
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3051
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3052
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3053
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3054
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3055
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3056
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3057
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3058
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3059
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3060
            ('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
  3061
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3062
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3063
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3064
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3065
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3066
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3067
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3068
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3069
                fullTempName moveTo:fullCachedName.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3070
                self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3071
            ]) ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3072
                self activityNotification:'CVS: Not cached.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3073
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3074
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3075
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3076
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3077
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3078
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3079
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3080
            fileName = 'extensions.st' ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3081
                self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3082
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3083
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3084
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3085
                self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3086
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3087
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3088
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3089
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3090
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3091
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3092
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3093
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3094
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3095
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3096
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3097
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3098
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3099
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3100
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3101
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3102
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3103
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3104
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3105
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3106
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3107
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3108
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3109
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3110
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3111
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3112
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3113
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3114
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3115
    "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
  3116
    "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
  3117
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3118
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3120
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3121
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3122
checkForExistingContainer:fileName inModule:moduleName directory:packageDirName
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3123
    "check for a container to exist. Return a boolean result."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3124
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3125
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3126
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3127
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3128
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3129
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3130
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3131
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3132
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3133
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3134
    packageDirName isEmptyOrNil ifTrue:[
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3135
        fullName := moduleName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3136
    ] ifFalse:[ 
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3137
        fullName := moduleName , '/' , packageDirName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3138
    ].
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3139
    
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3140
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3141
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3143
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3146
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3147
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3148
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3149
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3150
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3152
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3153
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3154
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3155
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3156
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3158
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3159
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3160
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3161
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3162
    "/ 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
  3163
    "/ (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
  3164
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3165
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3166
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3167
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3168
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3169
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3170
        
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3171
        SourceCodeManagerError handle:[:ex |
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3172
            ^ false.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3173
        ] do:[    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3174
            ret := self 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3175
                        executeCVSCommand:cmd , fullName 
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3176
                        module:moduleName 
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3177
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3178
                        "/ with a different CVSRoot in its CVS/Root file ...
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3179
                        "/ cvs would complain then.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3180
                        inDirectory:(tempDir pathName) 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3181
                        log:false
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3182
                        outputTo:outputStream
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3183
                        errorTo:errorStream.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3184
    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3185
            "cannot check for exit status starting at cvs 1.11.5, because an exit status 0
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3186
             is returned even if the file does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3187
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3188
            "But: if there is any output, the command failed and the container does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3189
            "/ cg: read comment above.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3190
            ret2 := errorStream size == 0.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3191
            ret2 ifFalse:[
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3192
                ret2 := (errorStream contents asCollectionOfLines 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3193
                            reject:[:l | l isBlank or:[(l includesString:'WARNING:')] ]) size == 0 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3194
            ].
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3195
        ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3197
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3198
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3199
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3200
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3203
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3204
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3205
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3208
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3209
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3210
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3213
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3214
    "Created: / 13-09-2006 / 18:20:36 / cg"
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3215
    "Modified (format): / 24-02-2017 / 11:32:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3216
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3221
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3222
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3223
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3224
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3225
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3226
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3227
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3228
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3229
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3230
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3231
    self activityNotification:'CVS: Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3235
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3236
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3237
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3240
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3241
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3242
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3243
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3244
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3245
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3246
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3247
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3248
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3249
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3250
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3251
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3252
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3253
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3254
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3255
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3256
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3257
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3258
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3259
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3260
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3261
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3262
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3263
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3264
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3266
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3267
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3268
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3269
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3270
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3271
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3272
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3273
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3274
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3275
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3277
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3282
    "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
  3283
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3284
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3286
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3287
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3289
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3290
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3291
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3292
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3293
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3294
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3295
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3296
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3297
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3298
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3299
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3300
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3302
    self activityNotification:'CVS: Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3304
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3305
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3306
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3307
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3308
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3309
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3310
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3311
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3312
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3313
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3314
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3315
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3316
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3317
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3318
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3319
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3320
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3321
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3322
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3323
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3324
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3325
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3326
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3327
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3328
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3329
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3331
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3332
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3333
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3334
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3335
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3336
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3339
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3340
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3341
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3342
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3343
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3344
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3345
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3346
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3347
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3350
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3351
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3352
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3354
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3355
    "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
  3356
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3357
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3358
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3363
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3365
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3366
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3367
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3368
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3369
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3370
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3371
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3372
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3373
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3375
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3376
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3377
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3378
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3379
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3380
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3382
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3384
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3385
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3386
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3387
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3388
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3389
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3393
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3394
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3395
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3396
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3397
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3398
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3399
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3404
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3407
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3413
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3418
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3419
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3421
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3426
    self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3429
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3430
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3431
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3432
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3453
    self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3454
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3457
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3477
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3482
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
    cmdOut remove.
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
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3503
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
    "/ (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
  3542
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3559
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3570
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3571
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3572
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3587
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3588
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3589
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3590
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3591
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3599
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3629
        self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3631
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3655
        self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
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
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3679
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3691
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3704
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3734
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3741
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3742
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3754
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3755
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3756
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3757
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3773
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3774
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
    "/ then import it into CVS
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
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
        ^ false.
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
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3794
    "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
  3795
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3796
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3797
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3798
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3799
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3808
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3809
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
        ('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
  3817
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
        cmdOut remove.
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
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3836
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3837
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3838
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3841
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3842
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3843
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3844
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3850
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3856
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3857
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3858
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3859
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3863
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
        ^ false.
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
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
    ^ true
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
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3878
    "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
  3879
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3880
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3883
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
  3884
    "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
  3885
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3886
    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
  3887
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3888
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3889
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3890
        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
  3891
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3892
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3893
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3894
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
  3895
    "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
  3896
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3897
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
     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
  3902
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3904
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3905
    "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
  3906
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3907
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3908
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3909
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3910
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3911
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3912
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3913
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3914
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3915
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3916
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3917
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3918
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3919
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3923
    "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
  3924
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3925
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3932
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3933
    "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
  3934
     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
  3935
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3936
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3937
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3938
    self activityNotification:'CVS: Fetching list of directories...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3939
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3940
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3941
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3942
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3943
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3944
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3945
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3946
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3947
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3948
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3949
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3950
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3951
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3952
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3953
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3954
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3955
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3956
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3957
    |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
  3958
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3959
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3960
    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
  3961
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3962
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3963
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3964
                        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
  3965
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3966
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3967
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3968
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3969
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3970
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3971
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3972
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3973
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3974
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3975
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3976
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3977
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3978
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3979
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3980
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3981
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3982
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3983
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3984
                "/ '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
  3985
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3986
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3987
                    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
  3988
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3989
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3990
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3991
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3992
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3993
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3994
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3995
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3996
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3997
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3998
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3999
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4000
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4001
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4002
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4003
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4004
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4005
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4006
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4007
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4008
     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
  4009
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4010
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4011
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4012
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4013
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4014
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4015
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4016
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4017
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4018
    self activityNotification:'CVS: Fetching list of containers...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4019
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4020
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4021
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4022
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4023
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4024
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4025
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4026
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4027
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4028
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4029
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4030
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4031
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4032
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4033
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4034
    "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
  4035
     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
  4036
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4037
    |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
  4038
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4039
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4040
         "/ 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
  4041
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4042
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4043
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4044
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4045
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4046
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4047
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4048
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4049
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4050
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4051
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4052
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4053
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4054
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4055
        modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4056
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4057
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4058
    ].        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4059
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4060
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4061
    [
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4062
        self activityNotification:'CVS: Fetching revision info for ', fullName.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4063
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4064
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4065
                        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
  4066
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4067
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4068
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4069
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4070
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4071
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4072
            ('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
  4073
            "/ 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
  4074
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4075
                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
  4076
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4077
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4078
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4079
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4080
            "/ 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
  4081
            "/ 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
  4082
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4083
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4084
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4085
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4086
                log:true 
4100
fcabc1395987 #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 4094
diff changeset
  4087
                outputTo:(WriteStream on:'') errorTo:(WriteStream on:'').
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4088
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4089
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4090
            "/ 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
  4091
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4092
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4093
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4094
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4095
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4096
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4097
                        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
  4098
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4099
                            (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
  4100
                                "/ 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
  4101
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4102
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4103
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4104
                        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
  4105
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4106
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4107
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4108
                                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
  4109
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4110
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4111
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4112
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4113
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4114
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4115
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4116
        ('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
  4117
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4118
        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
  4119
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4120
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4122
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4123
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4124
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4125
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4126
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4127
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4128
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4129
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4130
    "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
  4131
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4132
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4133
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4134
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4135
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4136
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4137
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4138
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4139
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4140
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4141
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4142
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4143
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4144
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4145
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4146
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4147
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4148
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4149
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4150
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4151
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4152
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4153
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4154
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4155
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4156
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4158
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4159
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4160
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4161
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4162
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4166
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4167
    self activityNotification:'CVS: Removing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4168
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4169
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4170
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4171
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4172
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4173
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4174
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4175
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4176
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4177
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4178
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4179
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4180
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4181
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4182
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4183
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4185
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4186
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4187
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4188
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4189
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4190
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4191
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4192
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4193
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4194
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4195
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4196
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4197
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4198
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4199
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4200
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4201
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4202
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4203
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4204
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4205
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4206
    self activityNotification:'CVS Committing removal of ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4207
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4208
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4209
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4210
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4211
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4212
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4213
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4214
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4215
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4216
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4217
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4218
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4219
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4220
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4221
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4222
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4223
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4224
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4225
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4226
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4227
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4228
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4229
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4230
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4232
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4233
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4234
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4235
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4237
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4238
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4239
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4240
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4241
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4242
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4243
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4244
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4245
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4246
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4247
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4248
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4249
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4250
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4251
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4252
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4253
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4254
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4255
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4256
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4257
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4258
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4259
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4260
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4261
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4262
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4263
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4264
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4265
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4266
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4267
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4268
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4269
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4270
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4271
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4272
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4273
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4274
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4275
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4276
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4277
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4278
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4279
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4280
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4281
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4282
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4283
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4284
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4285
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4286
     filterRep may be a collection of repository names 
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4287
     (i.e. 'stx', 'exept', 'phx' etc.) to only report changes made to one
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4288
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4289
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4291
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4292
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4294
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4295
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4296
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4297
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4298
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4299
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4300
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4301
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4302
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4303
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4304
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4306
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4307
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4309
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4310
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4311
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4312
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4313
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4314
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4315
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4316
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4317
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4318
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4319
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4320
        cmd := cmd , ' history -x ARMT -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4321
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4322
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4323
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4324
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4325
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4326
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4327
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4328
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4329
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4330
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4331
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4332
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4333
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4334
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4335
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4336
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4337
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4338
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4339
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4340
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4341
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4342
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4343
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4344
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4345
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4346
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4347
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4348
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4349
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4350
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4351
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4352
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4353
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4354
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4355
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4356
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4357
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4358
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4359
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4360
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4361
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4362
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4363
                        words := line asCollectionOfWords.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4364
                        words size < 7 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4365
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4366
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4367
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4368
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4369
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4370
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4371
                            recordType = 'T' ifTrue:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4372
                                rev := words at:7.   "something like [expecco_2_8_0:HEAD]"
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4373
                                module := fileName := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4374
                                fileName := fileName copyAfterLast:$/.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4375
                            ] ifFalse:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4376
                                rev := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4377
                                fileName := words at:7.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4378
                                pkgDir := words at:8.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4379
                                module := pkgDir.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4380
                            ].
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4381
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4382
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4383
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4384
                                    time := words at:3.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4385
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4387
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4388
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4390
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4391
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4394
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4395
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4399
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4400
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4402
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4417
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4418
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4421
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4422
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4423
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4424
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4425
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4426
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4427
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4428
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4429
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4430
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4431
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4444
    "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
  4445
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4465
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4466
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4467
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4468
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4469
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4473
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4474
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4476
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4477
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4478
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4479
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4480
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4481
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4482
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4483
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4484
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4485
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4486
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4487
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4488
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4489
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4490
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4491
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4492
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4493
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4494
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4495
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4496
            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
  4497
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4498
            "/ 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
  4499
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4500
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4501
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4502
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4503
            "/ temporary fix Felix' bad string translation:
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  4504
            (aString startsWith:'§Header:') ifTrue:[
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  4505
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4506
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4507
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4508
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4509
                        autoFixHolder value ifFalse:[
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  4510
                            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
  4511
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4512
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4513
                        (autoFixHolder value 
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  4514
                            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
  4515
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4516
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4517
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4518
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4519
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4520
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4521
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  4522
            "/ 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
  4523
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4524
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4525
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4526
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4527
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4528
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4529
                            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
  4530
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4531
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4532
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4533
                            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
  4534
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4535
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4536
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4537
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4538
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4539
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4540
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4541
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4542
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4543
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4544
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4545
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4546
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4547
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4548
                            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
  4549
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4550
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4551
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4552
                            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
  4553
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4554
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4555
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4556
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4557
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4558
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4559
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4560
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4561
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4562
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4563
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4564
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4565
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4566
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4567
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4568
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4569
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4570
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4571
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4572
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4573
revisionLogOf:clsOrNil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4574
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4575
    fileName:classFileName directory:packageDir module:moduleDir
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4576
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4577
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4578
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4579
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4580
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4581
     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
  4582
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4583
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4584
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4585
     filled with:
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4586
            #container          -> the CVS container file name
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4587
            #cvsRoot            -> the CVS root (repository)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4588
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4589
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4590
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4591
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4592
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4593
            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
  4594
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4595
              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
  4596
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4597
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4598
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4599
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4600
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4601
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4602
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4603
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4604
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4605
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4606
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4607
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4608
              #numberOfChangedLines  -> the number of changed lines w.r.t the previous (as string with +n -n)
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4609
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4610
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4611
            revisions are ordered newest first
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4612
            (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
  4613
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4614
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4615
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4616
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4617
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4618
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4619
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4620
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4621
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4622
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4623
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4624
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4625
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4626
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4627
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4628
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4629
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4630
        packageDir isEmptyOrNil ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4631
            modulePath := moduleDir
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4632
        ] ifFalse:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4633
            modulePath :=  moduleDir , '/' , packageDir.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4634
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4635
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4636
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4637
        self use_rlog ifFalse:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4638
            self createEntryFor:fullName
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4639
                 module:moduleDir
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4640
                 in:(tempDir construct:modulePath)
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4641
                 revision:'1.1'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4642
                 date:'dummy'
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4643
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4644
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4645
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4646
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4647
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4648
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4649
        (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
  4650
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4651
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4652
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4653
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4654
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4655
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4656
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4657
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4658
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4659
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4660
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4661
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4662
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4663
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4664
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4665
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4666
            msg := 'CVS: Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4667
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4668
            msg := 'CVS: Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4669
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4670
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4671
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4672
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4673
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4674
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4675
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4676
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4677
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4678
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4679
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4680
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4681
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4682
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4683
        inStream := self
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4684
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName)
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4685
                        module:moduleDir
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4686
                        inDirectory:tempDir
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4687
                        log:true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4688
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4689
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4690
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4691
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4692
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4693
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4694
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4696
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4697
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4698
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4699
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4700
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4701
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4702
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4703
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4704
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4705
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4706
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4707
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4708
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4709
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4710
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4711
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4712
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4713
                        s := line restAfter:word withoutSeparators:true.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4714
                        s notNil ifTrue:[info at:key put:s. gotIt := true].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4715
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4716
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4717
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4718
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4719
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4720
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4721
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4722
                        line:= inStream nextLine.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4723
                        [line notNil
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4724
                         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
  4725
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4726
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4727
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4728
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4729
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4730
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4731
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4732
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4733
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4734
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4735
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4736
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4737
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4738
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4739
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4740
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4741
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4742
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4743
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4744
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4745
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4746
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4747
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4748
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4749
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4750
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4751
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4752
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4753
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4754
            "/
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4755
            "/ continue to read the commands pipe output
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4756
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4757
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4758
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4759
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4760
                    "/ 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
  4761
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4762
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4763
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4764
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4765
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4766
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4767
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4768
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4769
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4770
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4771
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4772
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4773
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4774
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4775
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4776
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4777
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4778
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4779
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4780
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4781
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4782
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4783
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4784
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4785
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  4786
            OsError handle:[:ex |
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4787
                ('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
  4788
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4789
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4790
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4791
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4792
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4793
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4794
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4795
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4796
    "
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4797
     SourceCodeManager revisionLogOf:Array
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4798
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4799
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4800
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4801
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4802
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4803
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4804
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4805
    "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
  4806
    "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
  4807
    "Modified: / 05-02-2012 / 19:03:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4808
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4809
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4810
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4811
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4812
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4813
     each filled with:
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4814
            #container          -> the CVS container file name 
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4815
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4816
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4817
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4818
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4819
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4820
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4821
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4822
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4823
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4824
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4825
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4826
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4827
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4828
             -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
  4829
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4830
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4831
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4832
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4833
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4834
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4835
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4836
              #numberOfChangedLines  -> the number of changed lines w.r.t the previous (as string with +n -n)
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4837
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4838
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4839
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4840
            (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
  4841
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4842
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4843
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4844
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4845
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4846
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4847
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4848
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4849
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4850
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4851
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4852
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4853
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4854
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4855
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4856
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4857
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4858
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4859
        ].
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4860
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  4861
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4862
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4863
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4864
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4865
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4866
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4867
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4868
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4869
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4870
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4871
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4872
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4873
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4874
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4875
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4876
            msg := 'CVS: Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4877
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4878
            msg := 'CVS: Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4879
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4880
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4881
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4882
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4883
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4884
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4885
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4886
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4887
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4888
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4889
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4890
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4891
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4892
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4893
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4894
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4895
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4896
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4897
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4898
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4899
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4900
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4901
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4902
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4903
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4904
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4905
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4906
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4907
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4908
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4909
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4910
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4911
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4912
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4913
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4914
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4915
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4916
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4917
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4918
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4919
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4920
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4921
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4922
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4923
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4924
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4925
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4926
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4927
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4928
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4929
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4930
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4931
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4932
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4933
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4934
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4935
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4936
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4937
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4938
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4939
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4940
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4941
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4942
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4943
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4944
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4945
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4946
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4947
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4948
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4949
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4950
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4951
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4952
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4953
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4954
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4955
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4956
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4957
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4958
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4959
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4960
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4961
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4962
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4963
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4964
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4965
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4966
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4967
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4968
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4969
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4970
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4971
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4972
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4973
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4974
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4975
                            atEnd := true
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
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4978
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4979
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4980
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4981
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4982
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  4983
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4984
                info at:#filename put:fn.
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
            infoCollection at:(info at:#filename) put:info.    
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
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4989
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4990
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4991
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  4992
            OsError handle:[:ex |
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4993
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4994
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4995
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4996
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4997
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4998
        self activityNotification:nil.
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
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5001
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5002
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5003
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5004
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5005
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5006
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5007
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5008
    "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
  5009
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5010
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5011
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5012
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5013
    tempDir := nil.         "use the current directory"
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5014
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5015
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5016
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5017
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5018
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5019
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5020
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5021
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5022
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5023
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5024
    ].
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5025
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5026
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5027
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5028
        self activityNotification:('CVS: Fetching revision infos for %1%2'
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5029
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5030
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5031
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5032
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5033
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5034
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5035
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5036
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5037
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5038
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5039
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5040
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5041
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5042
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5043
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5044
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5045
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5046
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5047
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5048
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5049
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5050
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5051
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5052
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5053
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5054
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5055
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5056
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5057
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5058
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5059
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5060
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5061
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5062
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5063
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5064
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5065
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5066
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5067
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5068
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5069
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5070
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5071
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5072
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5073
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5074
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5075
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5076
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5077
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5078
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5079
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5080
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5081
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5082
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5083
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5084
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5085
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5086
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5087
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5088
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5089
    ].        
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5090
    self activityNotification:('CVS: Fetching revision infos for %1%2'
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5091
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5092
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5093
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5094
    [
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5095
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5096
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5097
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5098
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5099
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5100
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5101
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5102
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5103
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5104
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5105
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5106
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5107
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5108
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5109
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5110
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5111
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5112
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5113
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5114
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5115
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5116
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5117
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5118
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5119
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5120
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5121
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5122
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5123
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5124
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5125
    "Created: / 12-10-2006 / 10:12:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5126
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5127
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5128
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5129
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5130
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5131
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5132
     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
  5133
     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
  5134
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5135
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5136
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5137
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5138
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5139
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5140
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5141
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5142
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5143
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5144
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5145
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5146
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5147
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5148
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5149
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5150
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5151
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5152
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5153
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5154
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5155
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5156
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5157
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5158
     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
  5159
     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
  5160
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5161
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5162
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5163
    |paths alreadyWarned|
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5164
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5165
    alreadyWarned := 0.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5166
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5167
    paths := aCollectionOfClasses
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5168
                collect:[:cls |
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5169
                    |info path answer|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5170
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5171
                    cls isLoaded ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5172
                        Transcript showCR:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5173
                        alreadyWarned == 0 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5174
                            Dialog warn:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5175
                            alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5176
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5177
                            alreadyWarned == 1 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5178
                                answer := Dialog confirmWithCancel:('Cannot tag unloaded class: %1.\\Suppress further warnings?' withCRs bindWith:cls name).
4196
c1d94ff7867e #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4184
diff changeset
  5179
                                answer isNil ifTrue:[^ self].
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5180
                                answer == true ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5181
                                    alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5182
                                ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5183
                            ]
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5184
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5185
                        nil
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5186
                    ] ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5187
                        info := self sourceInfoOfClass:cls.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5188
                        info isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5189
                            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
  5190
                            nil
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5191
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5192
                            path := info at:#pathInRepository ifAbsent:nil.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5193
                            path isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5194
                                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
  5195
                            ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5196
                            path
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5197
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5198
                    ].
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5199
                ]
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5200
                thenSelect:[:path | path notNil].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5201
    self
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5202
        setSymbolicName:symbolicName
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5203
        revision:rev
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5204
        overWrite:overWriteBool
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5205
        pathes:paths
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5206
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5207
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5208
     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
  5209
     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
  5210
     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
  5211
     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
  5212
     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
  5213
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5214
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5215
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5216
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5217
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  5218
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
  5219
    "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
  5220
     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
  5221
     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
  5222
     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
  5223
     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
  5224
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5225
     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
  5226
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5227
    self
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5228
        setSymbolicName:symbolicName
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5229
        revision:rev
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5230
        overWrite:overWriteBool
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5231
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5232
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5233
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5234
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5235
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5236
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5237
     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
  5238
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5239
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5240
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5241
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5242
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5243
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5244
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5245
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5246
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5247
     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
  5248
     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
  5249
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5250
     If filename is nil, the symbolicName for a whole package is set.
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5251
     If multiple paths are given, the revision MUST be nil."
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5252
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5253
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5254
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5255
    symbolicName := (symbolicNameArg includes:Character space)
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5256
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5257
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5258
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5259
    pathesInRepository size > 1 ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5260
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5261
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5262
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5263
    moduleDirs := pathesInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5264
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5265
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5266
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5267
    moduleDirs do:[:moduleDir |
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5268
        |pathsInModule pathsInModuleAsArgument|
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5269
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5270
        pathsInModule := pathesInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5271
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5272
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5273
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5274
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5275
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5276
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5277
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5278
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5279
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5280
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5281
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5282
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5283
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5284
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5285
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5286
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5287
        pathsInModuleAsArgument := pathsInModule
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5288
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5289
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5290
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5291
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5292
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5293
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5294
                                        ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5295
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5296
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5297
        self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathsInModuleAsArgument).
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5298
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5299
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5300
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5301
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5302
        result := self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5303
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathsInModuleAsArgument)
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5304
                    module:moduleDir
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5305
                    inDirectory:nil
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5306
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5307
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5308
                    errorTo:errorStream.
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5309
        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
  5310
        (result not or:[errorStream size ~~ 0]) ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5311
            SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5312
        ] ifFalse:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5313
            (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5314
                SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5315
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5316
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5317
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5318
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5319
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5320
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5321
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5322
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5323
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5324
        setSymbolicName:'test1'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5325
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5326
        overWrite:true
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5327
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5328
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5329
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5330
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5331
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5332
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5333
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5334
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5335
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5336
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5337
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5338
        revision:0
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5339
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5340
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5341
                  '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
  5342
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5343
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5344
    "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
  5345
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5346
3931
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5347
standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5348
    "utility function: return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5349
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5350
    ^ 'Header: %1/%2/%3,v %4, %5 %6 %7 Exp'
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5351
        bindWith:moduleDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5352
        with:packageDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5353
        with:fileName
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5354
        with:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5355
        with:(Date today printStringFormat:'%y/%m/%d')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5356
        with:(Time now printStringFormat:'%h:%m:%s')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5357
        with:(OperatingSystem getLoginName)
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5358
        
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5359
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5360
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5361
     self 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5362
        revisionStringFor:Array 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5363
        inModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5364
        directory:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5365
        container:'Array.st' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5366
        revision:'123'          
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5367
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5368
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5369
    "Created: / 23-07-2012 / 18:46:29 / cg"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5370
!
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5371
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5372
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5373
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5374
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5375
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5376
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5377
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5378
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5379
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5380
     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
  5381
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5382
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5383
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5384
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5385
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5386
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5387
        modulePath :=  moduleDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5388
    ] ifFalse:[        
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5389
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5390
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5391
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5392
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5393
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5394
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5395
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5396
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5397
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5398
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5399
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5400
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5401
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5402
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5403
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5404
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5405
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5406
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5407
        msg := 'CVS: fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5408
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5409
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5410
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5411
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5412
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5413
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5414
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5415
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5416
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5417
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5418
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5419
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5420
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5421
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5422
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5423
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5424
            SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5425
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5426
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5427
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5428
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5429
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5430
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5431
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5432
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5433
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5434
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5435
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5436
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5437
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5438
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5439
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5440
                ((line includesString:'warning')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5441
                and:[ (line includesString:'is not')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5442
                and:[ (line includesString:'pertinent') ]]) ifTrue:[
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5443
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5444
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5445
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5446
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5447
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5448
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5449
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5450
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5451
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5452
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5453
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5454
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5455
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5456
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5457
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5458
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5459
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5460
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5461
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5462
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5463
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5464
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5465
        info isEmpty ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5466
            ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5467
            SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5468
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5469
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5470
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5471
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5472
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5473
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5474
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5476
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5477
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5478
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5479
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5480
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5481
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5482
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5483
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5484
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5485
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5486
!CVSSourceCodeManager class methodsFor:'source code utilities'!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5487
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5488
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5489
    "return info about who changed what and when.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5490
     Return nil on failure.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5491
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5492
     The returned information is a structure entry for each line
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5493
            #revision           -> version of last change
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5494
            #author             -> author 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5495
            #date               -> change date 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5496
        "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5497
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5498
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5499
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5500
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5501
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5502
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5503
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5504
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5505
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5506
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5507
        |cmd revArg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5508
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5509
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5510
        fullName :=  modulePath , '/' , classFileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5511
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5512
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5513
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5514
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5515
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5516
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5517
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5518
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5519
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5520
        msg := 'Fetching annotation log '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5521
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5522
            msg := msg , 'in ' , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5523
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5524
            msg := msg , 'of ', clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5525
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5526
        self activityNotification:msg,'...'.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5527
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5528
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5529
                        executeCVSCommand:('annotate ' , fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5530
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5531
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5532
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5533
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5534
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5535
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5536
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5537
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5538
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5539
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5540
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5541
        "/ read the commands pipe output and extract the info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5542
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5543
        info := IdentityDictionary new.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5544
        inHeaderInfo := true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5545
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5546
            line:= inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5547
            ((line ? '') startsWith:'*******') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5548
                inHeaderInfo := false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5549
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5550
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5551
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5552
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5553
        "/ continue to read the commands pipe output 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5554
        "/ and extract change info records
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5555
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5556
        [inStream atEnd] whileFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5557
            line := inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5558
Transcript showCR:line.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5559
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5560
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5561
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5562
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5563
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5564
            OsError handle:[:ex |
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5565
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5566
            ] do:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5567
                tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5568
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5569
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5570
        self activityNotification:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5571
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5572
    ^ info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5573
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5574
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5575
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5576
        annotationsFor:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5577
        fileName:'Array.st' directory:'libbasic' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5578
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5579
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5580
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5581
        annotationsFor:MenuPanel 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5582
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5583
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5584
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5585
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5586
diffListFor:clsOrNil fileName:classFileNameArg directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 cache:cacheIt
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5587
    "return diff info. This is supposed to return a standard diff-like
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5588
     list of lines, representing the diffs between two revisions.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5589
     experimental (for ownershipGraph).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5590
     Here we ask cvs to give us the diff list"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5591
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5592
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName diffDir|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5593
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5594
    clsOrNil notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5595
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5596
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5597
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5598
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5599
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5600
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5601
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5602
   (cacheIt) ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5603
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5604
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5605
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5606
            diffDir := (cacheDir / modulePath / '.diffs').
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5607
            diffDir exists ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5608
                diffDir makeDirectory.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5609
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5610
            cachedFile := diffDir / (classFileName,'_',rev1,'_',rev2).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5611
            cachedFile exists ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5612
                ^ cachedFile contents
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5613
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5614
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5615
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5616
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5617
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5618
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5619
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5620
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5621
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5622
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5623
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5624
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5625
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5626
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5627
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5628
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5629
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5630
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5631
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5632
        msg := 'CVS: Fetching diff list of '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5633
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5634
            msg := msg , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5635
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5636
            msg := msg , clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5637
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5638
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5639
        self activityNotification:msg.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5640
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5641
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5642
                        executeCVSCommand:('diff -w -r%1 -r%2 %3' bindWith:rev1 with:rev2 with:fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5643
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5644
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5645
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5646
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5647
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5648
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5649
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5650
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5651
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5652
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5653
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5654
        "/ read the command's pipe output, skipping some administrative info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5655
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5656
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5657
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5658
        list := inStream contents.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5659
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5660
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5661
        tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5662
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5663
    list := list reject:[:line | line startsWith:'\ '].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5664
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5665
    cachedFile notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5666
        cachedFile contents:list.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5667
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5668
    ^ list
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5669
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5670
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5671
     SourceCodeManager statusOf:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5672
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5673
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5674
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5675
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5676
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5677
    "Modified: / 29-08-2006 / 13:18:00 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5678
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5679
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5680
initialRCSRevisionStringFor:aClass in:dir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5681
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5682
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5683
    "/ do not make the string below into one string;
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5684
    "/ RCS would expand it into a wrong rev-string
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5685
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5686
    |nm oldRev idx special|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5687
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5688
    nm := fileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5689
    (nm endsWith:',v') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5690
        nm := nm copyButLast:2
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5691
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5692
    (nm endsWith:'.st') ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5693
        nm := nm , '.st'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5694
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5695
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5696
    oldRev := aClass revisionString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5697
    special := ''.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5698
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5699
    oldRev notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5700
        idx := oldRev lastIndexOf:$[.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5701
        idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5702
            idx := oldRev indexOf:$[ startingAt:idx+1.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5703
            idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5704
                special := ' ' , (oldRev copyFrom:idx).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5705
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5706
        ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5707
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5708
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5709
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5710
    ^ '$' , 'Header: ' , dir , '/' , fileName , ',v $'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5711
      , special
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5712
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5713
    "Modified: 17.9.1996 / 15:57:15 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5714
    "Created: 14.2.1997 / 20:59:28 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5715
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5716
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5717
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5718
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5719
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5720
    |cvsRoot fullName|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5721
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5722
    cvsRoot := self getCVSROOTForModule:moduleDir.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5723
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5724
    packageDir isEmptyOrNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5725
        fullName := (cvsRoot , '/' , moduleDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5726
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5727
        fullName := (cvsRoot , '/' , moduleDir , '/' , packageDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5728
    ].        
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5729
    ^ self initialRCSRevisionStringFor:aClass in:fullName container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5730
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5731
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5732
    "Created: / 23-08-2006 / 14:05:46 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5733
! !
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5734
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5735
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5736
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5737
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5738
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5739
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5740
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5741
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5742
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5743
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'documentation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5744
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5745
copyright
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5746
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5747
 COPYRIGHT (c) 2009 by eXept Software AG
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5748
              All Rights Reserved
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5749
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5750
 This software is furnished under a license and may be used
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5751
 only in accordance with the terms of that license and with the
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5752
 inclusion of the above copyright notice.   This software may not
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5753
 be provided or otherwise made available to, or used by, any
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5754
 other person.  No title to or ownership of the software is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5755
 hereby transferred.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5756
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5757
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5758
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5759
documentation
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5760
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5761
    In ancient times, Class used to return a Dictionary when asked for versionInfo.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5762
    This has been replaced by instances of VersionInfo and subclasses.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5763
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5764
    CVSVersionInfo adds some CVS specific data.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5765
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5766
    [author:]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5767
        cg (cg@AQUA-DUO)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5768
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5769
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5770
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5771
version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5772
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5773
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5774
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5775
version_CVS
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5776
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5777
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5778
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5779
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'instance creation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5780
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5781
fromRCSString:aString
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5782
    "{ Pragma: +optSpace }"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5783
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5784
    "I know how to parse RCS/CVS version id strings.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5785
     Return an instance filled with revision info which is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5786
     extracted from aString. This must be in RCS/CVS format."
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5787
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5788
    |words firstWord nextWord info nm s fn revString d |
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5789
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5790
    s := aString readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5791
    s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5792
    firstWord := s upToSeparator.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5793
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5794
    info := self new.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5795
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5796
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5797
    "/ supported formats:
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5798
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5799
    "/ $-Header:   pathName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5800
    "/ $-Revision: rev $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5801
    "/ $-Id:       fileName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5802
    "/
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  5803
    (firstWord = '$Header:' or:[firstWord = '§Header:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5804
        d := firstWord first.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5805
        s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5806
        nm := s throughAll:',v '.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5807
        nm := nm withoutSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5808
        info repositoryPathName:nm.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5809
        info fileName:(nm asFilename baseName copyButLast:2).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5810
        words := s upToEnd asCollectionOfWords readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5811
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5812
        words atEnd ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5813
            nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5814
            nextWord first ~= d ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5815
                info revision:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5816
                nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5817
                (nextWord notNil and:[nextWord first ~= d]) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5818
                    info date:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5819
                    info time:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5820
                    nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5821
                    (nextWord notNil and:[nextWord startsWithAnyOf:'+-']) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5822
                        info timezone:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5823
                        nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5824
                    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5825
                    info user:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5826
                    info state:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5827
                ]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5828
            ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5829
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5830
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5831
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5832
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  5833
    (firstWord = '$Revision:' or:[firstWord = '§Revision:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5834
        info revision:(s upToEnd asCollectionOfWords first).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5835
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5836
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5837
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  5838
    (firstWord = '$Id:' or:[firstWord = '§Id:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5839
        "/commented out by Jan Vrany, 2009/10/20
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5840
        "/according to http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5841
        "/svn has no support for $ Header $ expansion. Therefore
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  5842
        "/libsvn uses $ Id: $ instead.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5843
        "/self halt:'no longer supported'.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5844
        words := s upToEnd asCollectionOfWords readStream.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5845
        fn := words next.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5846
        (fn endsWith:',v') ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5847
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5848
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5849
        ].
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5850
        info fileName:(fn copyButLast:2).
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5851
        info revision:(revString := words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5852
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5853
        "/ do not use matchesRegex:'[0-9]+\.[0-9]+.*') here: regex is an optional package
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5854
        ((revString conform:[:c | c isDigit or:[c == $.]])
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5855
        and:[revString includes:$.]) ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5856
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5857
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5858
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5859
        info date:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5860
        info time:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5861
        info user:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5862
        info state:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5863
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5864
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5865
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5866
    ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5867
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5868
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5869
     CVSVersionInfo fromRCSString:('$' , 'Revision: 1.122 $')
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5870
     CVSVersionInfo fromRCSString:(CVSSourceCodeManager version)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5871
     CVSVersionInfo fromRCSString:(SVNSourceCodeManager version_CVS)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5872
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5873
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5874
    "Modified (comment): / 11-10-2011 / 23:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5875
    "Modified: / 22-11-2011 / 16:15:49 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5876
    "Modified (format): / 24-11-2011 / 10:56:51 / cg"
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  5877
    "Modified (format): / 07-03-2017 / 22:25:54 / mawalch"
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5878
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5879
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5880
!CVSSourceCodeManager::CVSVersionInfo methodsFor:'accessing'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5881
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5882
changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5883
    ^ changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5884
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5885
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5886
changedLinesInfo:aString
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5887
    changedLinesInfo := aString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5888
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5889
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5890
repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5891
    ^ repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5892
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5893
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5894
repositoryPathName:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5895
    repositoryPathName := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5896
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5897
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5898
timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5899
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5900
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5901
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5902
timeZone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5903
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5904
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5905
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5906
timezone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5907
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5908
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5909
    "Created: / 22-10-2008 / 20:50:39 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5910
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5911
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5912
timezone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5913
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5914
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5915
    "Created: / 22-10-2008 / 20:50:32 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5916
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5917
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5918
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5919
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5920
version
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5921
    ^ '$Header$'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5922
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5923
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5924
version_CVS
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5925
    ^ '$Header$'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5926
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5927
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  5928
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5929
CVSSourceCodeManager initialize!