CVSSourceCodeManager.st
author Claus Gittinger <cg@exept.de>
Wed, 30 Oct 2019 17:13:11 +0100
changeset 4512 70acad3387b4
parent 4509 a58d825e6d75
child 4518 1e1874f7a287
permissions -rw-r--r--
#OTHER by exept x
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     1
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     2
 COPYRIGHT (c) 1995 by Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     5
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    14
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    15
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    16
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    17
	instanceVariableNames:''
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    18
	classVariableNames:'AuthorMap CMD_checkout CVSBranchPerPackage CVSCommandSemaphore
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    19
		CVSCommandTimeout CVSCommitOptions CVSExecutable CVSModuleRoots
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    20
		CVSRoot CVSTempDir CVSUpdateOptions DisabledModules RecentTags
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    21
		RecentlyCheckedModulesAndPackages RemoteCVS'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    22
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    23
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    24
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    25
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    26
VersionInfo subclass:#CVSVersionInfo
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
    27
	instanceVariableNames:'repositoryPathName timeZone changedLinesInfo'
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    28
	classVariableNames:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    29
	poolDictionaries:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    30
	privateIn:CVSSourceCodeManager
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    31
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    32
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    33
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    34
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    35
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    36
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    37
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    38
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    40
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    41
 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
    42
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    43
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    44
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    45
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    46
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    47
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    48
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    variable being set by a private.rc file).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    55
    Under that top, for each module (especially the stx module itself),
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    57
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    58
    If not specified otherwise, the module defaults to 'stx'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    60
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
        (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
    73
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
    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
    76
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    85
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    88
        - 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
    89
          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
    90
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    91
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    92
        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
    93
        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
    94
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    95
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    96
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    97
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    98
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    99
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   100
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   103
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
                                        if false, disk access is used;
3948
mawalch
parents: 3931
diff changeset
   111
                                        files in CVSRoot must be accessible.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
4298
736e531022ff #DOCUMENTATION by mawalch
mawalch
parents: 4297
diff changeset
   162
        should accomplish this.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
        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
   181
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   191
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   192
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   193
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   194
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   195
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   197
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   198
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   199
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   200
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   201
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   202
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   203
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   204
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   205
4344
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   206
disabledModules:aCollectionOfModuleNames
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   207
    DisabledModules := aCollectionOfModuleNames.
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   208
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   209
    "
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   210
     self disabledModules:#('stx' 'exept')
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   211
     CVSSourceCodeManager classVarAt:#DisabledModules put:#('stx' 'exept') 
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   212
     CVSSourceCodeManager classVarAt:#DisabledModules put:nil 
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   213
    "
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   214
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   215
    "Created: / 31-07-2018 / 14:53:08 / Claus Gittinger"
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   216
!
c50a83dee9fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4340
diff changeset
   217
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   218
exeptsPrivateSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   219
    "the actual stx repository as used within exept.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   220
     Only valid within exept"
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   221
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   222
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   223
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   224
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   225
exeptsPublicSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   226
    "the public repository, which is a read-only copy of the exept-internal repository.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   227
     Updated every night."
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   228
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   229
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   230
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   231
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   237
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   238
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   239
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   240
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   241
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   242
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   243
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   244
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   245
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   246
4047
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   247
    | s f top |
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   248
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   249
    CVSCommandSemaphore isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   250
        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
   251
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   252
    CVSCommitOptions isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   253
        CVSCommitOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   254
        CVSUpdateOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   255
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   256
    RemoteCVS isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   257
        RemoteCVS := true.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   258
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   260
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   261
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   262
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   263
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   264
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   269
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   270
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   271
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   272
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   273
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   274
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    "/
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   282
    ((f := CVSRoot asFilename) isDirectory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   288
    DefaultManager isNil ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   289
        DefaultManager := self.
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   290
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   293
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   294
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
    "/ and updated/commited files are not removed.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   302
    "/ If you use a regular (make-) tree,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   314
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   316
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   317
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   318
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   321
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   322
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   323
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   324
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   325
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   326
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   327
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   328
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   329
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   330
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   331
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   332
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   333
    "Modified: / 20-03-2012 / 19:06:35 / cg"
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
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
    "set the global CVSROOT directory (i.e. the repositories name).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   338
     And reinitialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   339
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   340
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   341
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   342
    AbstractSourceCodeManager initialize.
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   343
    self initialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   344
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   345
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   346
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   347
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   348
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   349
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   350
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   351
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   352
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   353
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   354
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   355
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   356
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   357
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   358
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   359
    ((OperatingSystem getDomainName endsWith:'exept.de') or:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   360
     OperatingSystem getNetworkAddresses contains:[:eachSocketAddress| eachSocketAddress hostAddress startsWith: #[172 23 1]]]
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   361
    ) ifTrue:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   362
        self addExeptsPrivateRepositoryToModuleRoots.
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   363
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   364
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   365
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   366
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   367
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   368
CVSBranchPerPackage
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   369
    ^ CVSBranchPerPackage
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   370
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   371
    "Created: / 04-12-2017 / 17:30:34 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   372
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   373
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   374
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   375
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   376
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   377
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   378
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   379
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   380
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   381
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   382
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   383
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   384
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   385
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   386
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   387
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   388
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   389
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   390
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   391
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   392
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   393
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   394
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   395
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   396
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   397
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   398
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   399
    "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
   400
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   401
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   402
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   403
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   404
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   405
    "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
   406
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   407
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   408
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   409
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   410
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   411
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   412
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   413
    "Created: / 21-09-2006 / 15:31:12 / cg"
4361
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
   414
    "Modified: / 04-10-2018 / 15:40:32 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   415
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   416
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   417
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   418
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   419
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   420
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   421
        CVSExecutable := nil
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   422
    ] ifFalse:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   423
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   424
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   425
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   426
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   427
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   428
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   429
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   430
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   431
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   432
     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
   433
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   434
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   435
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   436
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   437
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   438
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   439
    d exists ifFalse:[
4414
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
   440
        d makeDirectory;
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
   441
          addAccessRights:#(readUser readGroup readOthers
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
   442
                            writeUser writeGroup writeOthers
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
   443
                            executeUser executeGroup executeOthers
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
   444
                            removeOnlyByOwner).
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   445
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   446
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   447
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   448
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   449
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   450
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   451
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   452
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   453
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   454
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   455
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   456
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   457
     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
   458
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   459
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   460
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   461
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   462
    "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   463
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   464
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   465
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   466
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   467
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   468
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   469
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   470
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   471
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   472
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   473
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   474
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   475
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   476
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   477
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   478
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   479
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   480
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   481
    "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
   482
3848
2768cbd5b7f1 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3834
diff changeset
   483
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   484
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
     self recentTag
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   487
    "
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   488
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   489
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   490
recentTag:aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   491
    "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
   492
4102
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   493
    aString isEmpty ifTrue:[
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   494
        ^ self.
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   495
    ].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   496
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   497
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   498
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   499
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   500
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   501
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   502
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   503
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   504
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   505
    "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
   506
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   507
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   508
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   509
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   510
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   511
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   512
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   513
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   514
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   515
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   516
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   517
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   518
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   519
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   520
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   521
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   522
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   523
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   524
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   525
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   526
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   527
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   528
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   529
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   530
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   531
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   532
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   533
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   546
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   554
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   555
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   556
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   561
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   562
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   563
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   564
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   565
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   566
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   567
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   568
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   569
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   570
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   571
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   572
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   573
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   574
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   575
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   576
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   577
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   578
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   579
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   584
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   585
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   586
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   587
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   588
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   589
    "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
   590
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   591
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   592
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   594
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   599
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   600
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   601
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   602
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   603
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   604
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   605
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   606
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   607
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   608
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   609
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   610
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   611
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   612
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   613
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   614
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   615
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   616
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   617
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   618
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   619
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   620
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   621
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   622
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   623
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   624
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   625
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   626
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   627
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   628
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   629
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   630
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   631
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   632
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   633
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   634
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   635
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   636
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   637
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   638
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   639
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   640
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   641
     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
   642
     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
   643
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   644
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   645
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   646
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   647
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   648
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   649
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   650
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   651
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   652
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   653
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   654
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   655
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   656
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   657
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   658
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   659
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   660
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   661
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   662
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   663
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   664
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   665
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   666
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   667
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   668
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   669
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   686
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   771
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   774
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   782
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   783
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   787
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   790
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   791
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   792
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   793
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   794
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   798
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   801
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   802
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   805
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   811
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   813
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   818
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   825
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   826
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   828
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   829
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   830
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
        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
   834
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   835
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   836
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   837
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   838
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   840
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
     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
   845
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   851
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   852
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   853
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   854
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   855
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   856
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   857
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   858
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   859
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   860
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   861
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   862
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   863
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   864
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   865
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   866
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   867
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   868
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   869
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   870
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   871
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   872
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   873
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   874
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   875
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   876
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   877
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   878
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   879
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   880
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   881
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   882
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   883
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   884
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   885
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   886
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   887
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   888
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   889
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   890
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   891
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   892
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   893
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   894
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   895
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   896
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   897
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   898
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   899
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   901
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   904
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   905
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   906
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   907
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   914
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   916
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   924
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   926
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   927
                defaultContents notNil ifTrue:[
3949
0514468a25e4 #BUGFIX
mawalch
parents: 3948
diff changeset
   928
                    s nextPutAll:defaultContents.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   929
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   943
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   945
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   951
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   955
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   956
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   957
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   961
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   962
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   963
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   966
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   967
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   974
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   976
    "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
   977
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   978
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   984
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   987
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   988
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   994
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   997
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1000
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1001
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1003
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1005
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1006
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1007
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1008
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1009
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1010
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1011
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1012
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1013
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1014
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1015
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1016
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1017
     if dir ~= nil, execute command in that directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1018
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1019
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1020
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1021
    ^ self
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1022
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1023
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1024
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1025
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1026
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
  1027
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1028
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1029
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1030
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1031
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1032
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1033
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1034
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1035
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1036
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
  1037
    "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
  1038
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1039
     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
  1040
     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
  1041
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1042
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1043
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1044
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1045
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1046
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1047
        pipe:false
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1048
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1049
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1050
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1051
    "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
  1052
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1053
    "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
  1054
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1055
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1056
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1057
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1058
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1059
     The doLog argument, if false suppresses a logEntry to be added
4467
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1060
     in the cvs log file (used when reading / extracting history).
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1061
     sigh: returns either a stream (if doPipe == true) or a boolean otherwise."
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1062
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1063
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1064
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1065
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1066
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1067
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1068
        pipe:doPipe
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1069
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1070
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1071
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1072
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1073
    "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
  1074
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1075
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1076
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1077
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1078
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
  1079
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1080
     execute command in the dirArg directory (or the current directory if dirArg is nil).
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1081
     The doLog argument, if false suppresses a logEntry to be added
4467
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1082
     in the cvs log file (used when reading / extracting history).
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1083
     sigh: returns either a stream (if doPipe == true) or a boolean otherwise."
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1084
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1085
    |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
  1086
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1087
    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
  1088
        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
  1089
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1090
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1091
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1092
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1093
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1094
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1095
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1096
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1097
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1098
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1099
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1100
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1101
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1102
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1103
    "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
  1104
    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
  1105
        (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
  1106
            (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
  1107
                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
  1108
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1109
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1110
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1111
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1112
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1113
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1114
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1115
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1116
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1117
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1118
    doPipe ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1119
        rslt := PipeStream
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1120
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1121
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1122
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1123
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1124
    ] ifFalse:[
4509
a58d825e6d75 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4487
diff changeset
  1125
        osProcess := OSProcess new.
a58d825e6d75 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4487
diff changeset
  1126
        osProcess command:command directory:pathOfDir outStream:outStreamOrNil errorStream:errorStreamOrNil.
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1127
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1128
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1129
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1130
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1131
            "/ 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
  1132
            ok := rslt := osProcess execute.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1133
        ] ifTrue:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1134
            CVSCommandSemaphore critical:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1135
                |errOut done|
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1136
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1137
                errOut := WriteStream on:''.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1138
                osProcess errorStream:errOut.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1139
                ok := osProcess startProcess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1140
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1141
                [
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1142
                    done := true.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1143
                    (osProcess waitUntilFinishedWithTimeout:self cvsCommandTimeout) isNil ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1144
                        (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
  1145
                                                bindWith:self cvsCommandTimeout with:command)) 
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1146
                        ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1147
                            done := false
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1148
                        ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1149
                            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1150
                            osProcess terminate.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1151
                            ok := false.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1152
                            errorString := 'CVS command timeout'.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1153
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1154
                    ] ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1155
                        ok := rslt := osProcess finishedWithSuccess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1156
                        ok ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1157
                            errorString := errOut contents.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1158
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1159
                    ]
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1160
                ] doUntil:[done].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1161
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1163
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1164
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1165
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1166
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1167
            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
  1168
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1169
    ].
4467
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1170
    "/ sigh: is either a stream (if doPipe == true)
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  1171
    "/ or a boolean otherwise.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1172
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1173
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1174
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1175
    "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
  1176
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1177
    "Created: / 28-02-2012 / 17:30:34 / cg"
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1178
    "Modified: / 06-12-2017 / 03:22:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1179
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1180
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1181
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1184
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1189
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
        line notNil ifTrue:[
4356
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1191
            Transcript showCR:line.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1192
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1193
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1194
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1195
                s notNil ifTrue:[
4356
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1196
                    revisionUsed := nil.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1198
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1199
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1202
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1203
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
                ].
4356
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1208
                "/ only the very first encountered revision is remembered/reported
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1209
                revisionUsed isNil ifTrue:[ 
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1210
                    s := line restAfter:searchFor withoutSeparators:true.
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1211
                    s notNil ifTrue:[ |i|
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1212
                        i := s indexOfSeparator.
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1213
                        i ~~ 0 ifTrue:[
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1214
                            s := s copyTo:i-1
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1215
                        ].
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1216
                        revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1217
                        info add:(fileName -> revisionUsed).
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1218
                        fileName := nil.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1219
                    ].
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1220
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1221
            ].
2938
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
    ^ info
4356
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1225
6f35b83c8aff #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4344
diff changeset
  1226
    "Modified: / 27-09-2018 / 10:04:07 / Claus Gittinger"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1230
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1235
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1236
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1239
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1241
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1242
                s notNil ifTrue:[
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1243
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1244
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1245
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1246
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1247
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1248
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1249
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1250
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1251
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1252
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1253
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1254
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1255
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1256
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1257
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1258
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1259
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1260
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1261
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1262
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1263
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1264
                    fileName := revisionUsed := nil.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1265
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1266
            ].
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1267
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1268
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1269
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1270
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1271
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1281
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1296
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1298
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1302
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1303
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1306
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1308
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1309
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1310
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1311
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1312
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1313
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1314
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1315
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1316
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1317
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1318
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1319
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1320
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1321
    "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
  1322
     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
  1323
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1324
     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
  1325
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1326
              #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
  1327
              #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
  1328
              #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
  1329
              #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
  1330
              #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
  1331
              #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
  1332
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1333
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1334
    |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
  1335
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1336
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1337
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1338
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1339
    [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
  1340
        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
  1341
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1342
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1343
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1344
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1345
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1346
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1348
        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
  1349
        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
  1350
        "/ decompose date/author/state etc.
4256
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1351
        revLine2 asCollectionOfSubCollectionsSeparatedBy:$; do:[:info |
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1352
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1353
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1354
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1355
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1356
              'state:'  #state 
4422
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  1357
              'lines:'  #numberOfChangedLines
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1358
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1359
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1360
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1361
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1362
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1363
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1364
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1365
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1366
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1367
        "first revision does not have a 'lines:' entry"
4422
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  1368
        (record at:#numberOfChangedLines ifAbsent:[nil]) isNil ifTrue:[
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  1369
            record at:#numberOfChangedLines put:''
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1370
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1371
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1372
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1373
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1374
        [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
  1375
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1376
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1377
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1378
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1379
                    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
  1380
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1381
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1382
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1383
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1384
                    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
  1385
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1386
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1387
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1388
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1389
        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
  1390
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1391
    ^record.
4256
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1392
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1393
    "Modified: / 20-09-2017 / 20:16:45 / stefan"
4411
493c05fdb9a7 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4401
diff changeset
  1394
    "Modified: / 12-03-2019 / 10:59:24 / Stefan Vogel"
4422
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  1395
    "Modified: / 12-05-2019 / 13:01:52 / Claus Gittinger"
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1396
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1397
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
    "/
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
  1416
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1422
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1425
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1426
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1429
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1432
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1433
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1434
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1435
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1436
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1439
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1440
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1446
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1447
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1448
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1451
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1452
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1455
repositoryTopDirectoryFromSCMRoot
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1456
    "return the top of the repository. This handles remote CVS connections
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1457
     as well"
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1458
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1459
    CVSRoot isNil ifTrue:[^ nil].
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1460
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1461
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1462
    "
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1463
     CVSSourceCodeManager repositoryTopDirectory
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1464
    "
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1465
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1466
    "Created: / 18-05-2018 / 12:30:05 / Stefan Vogel"
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1467
!
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1468
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1477
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1478
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1479
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1480
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1481
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1482
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1483
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1484
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1485
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1486
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1487
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1488
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1489
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1490
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1491
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1492
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1493
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1494
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1495
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1496
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1497
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1498
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1500
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
     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
  1503
     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
  1504
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1506
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1507
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1513
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1514
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1515
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1516
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1517
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1518
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1520
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1521
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1522
             "/ already a modified class
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1523
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1524
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1525
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1526
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1527
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1528
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1529
    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1530
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1531
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1532
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1533
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1534
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1535
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1536
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1537
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1538
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1539
    "/ 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
  1540
    "/      '$ 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
  1541
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1542
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1543
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1544
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1545
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1546
    "/      'Exp $'
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1547
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'.
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1548
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1549
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1550
    "Modified (comment): / 13-04-2017 / 19:29:22 / mawalch"
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1551
!
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1552
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1554
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1555
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1559
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1560
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1563
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1564
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1565
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1566
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1567
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1568
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1571
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1572
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1573
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1574
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1575
             "/ already a modified class
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1576
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1577
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1578
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1579
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1580
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1581
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1582
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1583
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1584
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1585
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1586
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1587
    "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
  1588
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1589
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1590
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1591
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1592
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1593
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1594
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1595
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1596
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1597
2449
vrany
parents: 2403
diff changeset
  1598
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1599
vrany
parents: 2403
diff changeset
  1600
    "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
  1601
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1602
vrany
parents: 2403
diff changeset
  1603
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1604
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1605
vrany
parents: 2403
diff changeset
  1606
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1607
!
vrany
parents: 2403
diff changeset
  1608
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1609
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1610
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1611
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1612
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1613
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1614
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1615
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1616
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1617
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1618
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1619
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1620
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1621
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1622
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1623
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1624
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1625
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1626
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1627
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1628
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1629
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1630
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1631
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1632
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1633
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1634
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1635
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1636
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1637
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1638
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1639
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1640
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1641
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1642
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1643
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1644
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1645
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1646
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1647
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1648
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1649
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1650
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1651
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1652
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1653
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1654
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1655
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1656
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1657
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1658
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1659
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1661
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force onBranch:branchNameOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1662
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1666
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1667
    |tempdir cmd checkoutName logMsg revision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1668
     cmdOut whatHappened idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1669
     newRevision  msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1670
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1671
     editor checkInRepaired didAccept emphasizedText repairedText out
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1672
     emSep comment branchTag|
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1673
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1674
    branchNameOrNil notNil ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1675
        branchTag := (self branchTagPrefix,branchNameOrNil).
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1676
        revision := self utilities
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1677
                        revisionForSymbolicName:branchTag
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1678
                        class:nil
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1679
                        fileName:containerFilename
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1680
                        directory:packageDir
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1681
                        module:moduleDir
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1682
                        manager:self.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1683
    ] ifFalse:[    
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1684
        revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1685
    ].
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1686
    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1687
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1688
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1689
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1690
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1691
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1692
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1693
        modulePath := moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1694
    ] ifFalse:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1695
        modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1696
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1697
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1698
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1699
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1700
        "/ a new file ...
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1701
        ^ self createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1702
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1703
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1704
    [
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  1705
        cmdOut := FileStream newTemporary close; fileName.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1708
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1709
        "/ 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
  1710
        "/ other users changes.
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1713
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1714
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1715
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1716
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1717
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1718
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1719
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1720
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1721
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1722
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1723
        "/ 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
  1724
        "/
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
        "/ correct our current time, so that converting it will give us UTC
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  1727
        time := UtcTimestamp now subtractSeconds:1.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1728
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1729
        self createEntryFor:checkoutName
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1730
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1731
             in:(tempdir construct:modulePath)
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1732
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1733
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1734
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1735
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1736
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1737
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1739
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
        ] do:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1744
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1745
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1749
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1750
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1751
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1752
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1753
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  1754
        self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1755
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1756
        branchTag notNil ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1757
            cmd := 'update ', CVSUpdateOptions, ' -r ', branchTag, ' ' , containerFilename, ' >', '"' , cmdOut name , '"'.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1758
        ] ifFalse:[    
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1759
            cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1760
        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1761
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1762
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1768
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1770
        ] ifTrue:[
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
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1775
            "/   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
  1776
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1777
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1779
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1780
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1781
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1783
        (whatHappened isEmptyOrNil) ifTrue:[
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
            "/ no change
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
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1788
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1791
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1792
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1795
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1796
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1797
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1798
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1799
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1800
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1801
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1802
                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
  1803
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1804
            changeLog notNil ifTrue:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1805
                |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1806
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1807
                s := CharacterWriteStream new.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1808
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1809
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1810
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1811
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1812
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1813
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1814
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1815
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1816
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1817
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1818
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1819
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1821
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1822
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1823
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1824
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1826
                            and:[(line startsWith:'Merging') not
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1827
                            and:[line notEmpty]]]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1828
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1829
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1830
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1831
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1832
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1833
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1834
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1835
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1836
            or:[changeLog isNil
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1837
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1838
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1839
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1840
                "/
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1841
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1842
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1843
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1844
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1845
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1846
                "/ 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
  1847
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1848
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1849
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1850
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1851
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1852
                mySource := someText.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1853
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1854
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1855
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1856
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1858
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1860
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1861
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1862
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1863
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1865
                                   abortable:false
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1866
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1867
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1868
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1869
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1870
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1871
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1872
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1873
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1874
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
  1875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1878
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1884
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1885
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1886
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1887
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1888
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1889
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1890
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1891
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1892
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1893
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1894
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1895
                                label:'merged version'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1896
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1897
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1898
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1899
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1900
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1901
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1902
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1903
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1904
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1905
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1906
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1907
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1908
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1909
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1910
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1914
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1915
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1916
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1917
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1918
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1919
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1920
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1921
"/                ].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1922
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1926
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1927
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1928
                "/ 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
  1929
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1930
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1934
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1935
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1936
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1937
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1938
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1939
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1940
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1942
                     message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1943
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1945
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1946
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1947
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1949
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1950
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1953
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1954
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1955
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1956
                        label:'newest repository version'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1957
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1958
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1959
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1960
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1961
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1962
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1963
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1964
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1965
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1966
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1967
                    "/ ... accept will check it in.
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
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1971
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1972
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1973
                                emphasizeMergedDiff3Text:emphasizedText
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1974
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1976
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1977
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1980
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1981
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1982
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1983
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1984
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1985
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1986
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1987
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1988
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1989
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1990
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1991
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1992
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1993
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1994
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1995
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1996
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1997
                        editor := RCSConflictEditTextView
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1998
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1999
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2000
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2001
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2002
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2003
                            didAccept := true.
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
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2006
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2007
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2008
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2009
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2010
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2011
                                checkInRepaired := false.
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
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2014
                            "/ check if all green-stuff (separators) have been removed
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2015
                            (repairedText contains:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2016
                                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
  2017
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2019
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2020
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2021
                    ].
3264
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
                    checkInRepaired ifTrue:[
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
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2026
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2027
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2028
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2029
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2030
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2031
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2032
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2033
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2034
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
                checkInRepaired ifTrue:[
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2037
                    Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2038
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2039
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2040
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2041
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2042
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2043
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2044
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2045
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2046
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2047
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2048
                    "/
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
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2051
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2052
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2054
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2055
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2057
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2058
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2059
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2060
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2064
            ]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
        ].
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2068
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2069
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2070
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2071
        self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2072
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2073
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2075
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2076
            "/ save the log message into another tempFile ...
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2077
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2078
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2079
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2080
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2081
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2082
            s close.
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
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2085
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2086
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2087
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2088
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2089
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2090
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2091
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2092
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2093
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2096
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2099
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2100
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2101
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2102
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2104
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2105
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2106
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2107
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2108
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2109
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2110
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2111
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2113
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2114
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2115
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2116
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2117
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2118
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
4327
f756bc4c48c4 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4322
diff changeset
  2119
            self activityNotification:'Checkin failed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2120
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2121
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2122
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2124
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2125
            whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2126
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2127
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2128
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2129
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2130
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2131
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2132
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2133
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2134
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2135
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2136
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2137
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2138
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2139
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2140
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2141
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2142
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2143
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2144
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2145
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2146
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2147
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2148
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
    ].
4327
f756bc4c48c4 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4322
diff changeset
  2150
    self activityNotification:'Done.'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2152
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  2153
    "Created: / 05-12-2017 / 23:28:31 / cg"
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  2154
    "Modified: / 06-12-2017 / 03:19:59 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2155
    "Modified: / 09-05-2018 / 19:31:44 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2156
    "Modified: / 18-05-2018 / 13:43:44 / Stefan Vogel"
4327
f756bc4c48c4 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4322
diff changeset
  2157
    "Modified: / 31-05-2018 / 11:59:20 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2160
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
  2161
    ^ 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
  2162
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2163
    "Created: / 11-09-1996 / 16:16:11 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2164
    "Modified: / 31-07-2013 / 18:07:53 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2165
    "Modified: / 29-03-2017 / 18:21:23 / stefan"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2166
!
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2167
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2168
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
  2169
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2170
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2171
     instead, the code is checked in as given (Dangerous).
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2172
     Return true if ok, false if not.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2173
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2174
     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
  2175
     (branch support does not work yet!!)"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2176
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2177
    |tempdir cmd checkoutName logMsg classRevision newestRevision cmdOut whatHappened s entry idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2178
     newRevision newString binRevision className msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2179
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2180
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2181
     emSep force conflictResolvedManually revisionOption retryCount|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2182
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2183
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2187
        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
  2188
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2190
    classRevision := cls revisionOfManager:self.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2191
    (classRevision notNil and:[classRevision endsWith:$m]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
        "/ must use the original revision string.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2195
        classRevision := classRevision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2197
    binRevision := cls binaryRevision.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2198
    (binRevision notNil and:[classRevision ~= binRevision]) ifTrue:[
4485
11de50dd8c35 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4467
diff changeset
  2199
        Transcript showCR:'CVSSourceCodeManager [info]: class %1 is based upon %2 but has revision %3' with:className with:binRevision with:(classRevision ? '?').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2200
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2201
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2202
    classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2203
        "there is no version method. Get the version from the repository"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2204
        classRevision := newestRevision := self newestRevisionOf:cls.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2205
        classRevision isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2206
            force ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2207
                classRevision := newestRevision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2208
            ].
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2209
            classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2210
                classRevision := '1.0'   "/ initial checkin
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2211
            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2212
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2213
            classRevision == #deleted ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2214
                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
  2215
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2216
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2217
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2218
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2219
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2220
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2221
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2222
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2223
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2224
            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
  2225
            ^ false.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2226
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2227
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2228
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  2229
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2230
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2231
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2232
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2233
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2234
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2235
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2237
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2238
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2239
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2240
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2241
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2242
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2243
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2244
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2245
    [ "ensure protected block"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2246
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2247
        "/ 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
  2248
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2249
        packageDir isEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2250
            modulePath := moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2251
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2252
            modulePath :=  moduleDir , '/' , packageDir.
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
        checkoutName :=  modulePath , '/' , classFileName.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2255
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2256
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2257
        "/ 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
  2258
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2259
        time := UtcTimestamp now subtractSeconds:1.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2260
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2261
        self createEntryFor:checkoutName
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2262
             module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2263
             in:(tempdir construct:modulePath)
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2264
             revision:classRevision
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2265
             date:(self cvsTimeString:time)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2266
             special:''
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2267
             overwrite:true.
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
        "/ copy-over our current version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2271
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2272
        Error handle:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2273
            self reportError:'cannot copy-over filedOut class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2274
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2275
        ] do:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2276
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2277
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2278
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2279
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2280
        "/ synchronize i.e. merge in any changes
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2281
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2282
        self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2283
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2284
        revisionOption := ''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2285
        branchTag notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2286
            revisionOption := '-r ', branchTag.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2287
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2288
            (classRevision occurrencesOf:$.) > 2 ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2289
                "must be a branch, compare with branch revision"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2290
                revisionOption := '-r ', classRevision copyUpToLast:$..
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2291
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2292
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2293
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2294
        cmd := 'update %1 %4 %2 >"%3"'
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2295
                    bindWith:CVSUpdateOptions
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2296
                    with:classFileName
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2297
                    with:cmdOut name
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2298
                    with:revisionOption.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2299
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2300
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2301
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2302
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2303
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2304
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2305
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2306
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2307
                    "/ no container
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2308
                    "/ someone fiddled around with repository ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2309
                    (cls binaryRevision notNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2310
                        (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
  2311
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2312
                            cls setBinaryRevision:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2313
                            ^ 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
  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
                    (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
  2317
                    ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2318
                        ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2319
                    ].
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2322
                "/ is the version correct ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2323
                newestRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2324
                    newestRevision := self newestRevisionOf:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2325
                    newestRevision isNil ifTrue:[
4485
11de50dd8c35 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4467
diff changeset
  2326
                        (Dialog confirm:('The source container for %1 seems corrupted. Proceed?' bindWith:cls name allBold)) ifFalse:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2327
                            ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2328
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2329
                        ^ self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2330
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2331
                            source:sourceFileName logMessage:logMessage force:true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2332
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2333
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2334
"/            revision > newestRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2335
"/                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
  2336
"/                ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2337
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2338
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2339
"/                    ^ 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
  2340
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2341
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2342
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2343
"/            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
  2344
"/            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2345
                "/ if we arrive here, proceed as if merged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2346
                whatHappened := 'M initial'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2347
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2348
        ] ifTrue:[
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
            "/ check what happened - the contents of the cmdOut file may be:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2351
            "/   empty   -> nothing changed
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2352
            "/   M xxx   -> merged-in changes from other users
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2353
            "/   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
  2354
            "/              needs special action
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2355
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2356
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2357
                whatHappened := cmdOut contentsAsString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2358
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2359
                self breakPoint:#cg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2360
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2361
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2362
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2363
        (whatHappened isEmptyOrNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2364
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2365
            "/ no change
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2366
            "/
4485
11de50dd8c35 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4467
diff changeset
  2367
            Transcript showCR:'no change in %1 (repository unchanged)' with:className.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2368
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2369
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2370
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2371
"/                (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
  2372
"/                    ChangeSet current condenseChangesForClass:cls.
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
"/            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2375
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2376
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2377
                self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2378
            ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2379
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2380
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2381
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2382
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2383
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2384
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2385
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2386
                    newString isEmptyOrNil ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2387
                        'CVSSourceCodeManager [error]: missing revisionString' errorPrintCR
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2388
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2389
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2390
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2391
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2392
                        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2393
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
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
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2396
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2397
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2398
            ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2399
        ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2400
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2401
        Verbose == true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2402
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2403
        ].
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
        force ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2406
            |nextRevision|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2407
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2408
            classRevision notNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2409
                nextRevision := self revisionAfter:classRevision.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2410
            ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2411
            changeLog := self revisionLogOf:cls fromRevision:nextRevision toRevision:nil.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2412
            changeLog notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2413
                s := CharacterWriteStream on:''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2414
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2415
                changesAsLogged := s contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2416
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2417
                "/ mhmh - that should not happen
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2418
                changesAsLogged := ''.
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
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2421
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2422
        didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2423
        conflictResolvedManually := checkInRepaired := checkInNew := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2424
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2425
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2426
        "/ cvs above rel10 returns a multiline info ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2427
        "/ we have to extract the one line which states what happened.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2428
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2429
        whatHappened := whatHappened asCollectionOfLines reject:[:line |
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2430
                            line isEmpty
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2431
                            or:[(line startsWith:'RCS file')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2432
                            or:[(line startsWith:'retrieving')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2433
                            or:[(line startsWith:'Merging')]]]
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2434
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2435
        whatHappened := whatHappened asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2436
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2437
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2438
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2439
            "/ merged in changes / resurrected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2440
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2441
            (force
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2442
             or:[changeLog isNil
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2443
             or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2444
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2445
                "/ pretty good - nothing has changed in the meanwhile
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2446
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2447
                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
  2448
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2449
                |mySource mergedSource |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2450
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2451
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2452
                "/ 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
  2453
                "/ and version have been merged.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2454
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2455
                didMerge := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2456
                changesAsLogged := changesAsLogged asCollectionOfLines.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2457
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2458
                s := CharacterWriteStream new.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2459
                self fileOutSourceCodeOf:cls on:s.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2460
                mySource := s contents.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2461
                mergedSource := (tempdir construct:checkoutName) readStream contentsAsString.
4229
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
                mySource = mergedSource ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2464
                    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
  2465
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2466
I have merged your version with the newest repository version,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2467
and found no differences between the result and your current version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2468
(i.e. your version seemed up-to-date).'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2469
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2470
                    self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2471
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2472
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2473
                                   abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2474
                                   option:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2475
                    didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2476
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2477
                    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
  2478
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2479
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
  2480
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
  2481
into a new common revision which may be different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2482
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
  2483
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2484
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
  2485
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
  2486
change methods as required and check in again.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2487
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
  2488
and you should update your class from the repository.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2489
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2490
Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2491
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2492
                    answer := self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2493
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2494
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2495
                                   abortable:true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2496
                                   option:'Stop - see first'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2497
                                   option2:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2498
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2499
                    answer == #option2 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2500
                        (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
  2501
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2502
                            s := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2503
                            self fileOutSourceCodeOf: cls on:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2504
                            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2505
                            answer := true.
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
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2508
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2509
                    answer ~~ true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2510
                        answer == #option ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2511
                            DiffCodeView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2512
                                openOn:mySource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2513
                                label:'current version'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2514
                                and:mergedSource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2515
                                label:'merged version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2516
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2517
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2518
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2519
                        ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2520
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2521
                ].
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
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2524
"/                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
  2525
"/' , changesAsLogged , '
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
"/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
  2528
"/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
  2529
"/into a new common revision which is different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2530
"/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
  2531
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2532
"/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
  2533
"/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
  2534
"/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
  2535
"/is different from your current classes.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2536
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2537
"/Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2538
"/                (self confirm:msg) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2539
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2540
"/                    ^ false.
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
                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
  2543
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2544
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2545
            (whatHappened startsWith:'C ') ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2546
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2547
                "/ conflict; someone else checked in something in the meanwhile,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2548
                "/ 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
  2549
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2550
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2551
                changesAsLogged := changesAsLogged asCollectionOfLines.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2552
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2553
                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
  2554
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2555
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
  2556
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2557
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
  2558
and change your methods avoiding conflicts. Then checkin again.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2559
'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2560
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2561
                answer := self checkinTroubleDialog:'Version conflict'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2562
                     message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2563
                     log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2564
                     abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2565
                     option:'Show conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2566
                     option2:'Resolve conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2567
                     option3:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2568
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2569
                answer == #option ifTrue:[
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
                    "/ show conflicts in a 3-way DiffTextView ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2572
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2573
                    Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2574
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2575
                        label:'your version (checkin attempt)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2576
                        label:'original (base version)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2577
                        label:'newest repository version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2578
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2579
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2580
                answer == #option2 ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2581
                    |diffComment|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2582
4229
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
                    "/ allow checkin of repair version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2585
                    "/ this is error prone ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2586
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2587
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2588
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2589
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2590
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2591
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2592
                    emSep := (Array with:(#color->Color black)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2593
                                 with:(#backgroundColor->Color green)).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2594
                    emphasizedText := Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2595
                                emphasizeMergedDiff3Text:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2596
                                emphasize1:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2597
                                                  with:(#backgroundColor->Color blue))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2598
                                emphasize2:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2599
                                                  with:(#backgroundColor->Color red))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2600
                                emphasizeSep:emSep.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2601
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2602
                    diffComment :=
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2603
'"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2604
"/ This text contains your current versions code (blue)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2605
"/ 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
  2606
"/ from some other checkin.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2607
"/ Each such conflict is surrounded by green text (like this paragraph).
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
"/ 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
  2610
"/ 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
  2611
"/ 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
  2612
"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2613
'.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2614
                    diffComment := (Text string:diffComment emphasis:emSep) asStringCollection.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2615
                    emphasizedText := diffComment , emphasizedText.
4229
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
                    didAccept := false. checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2618
                    [didAccept not and:[checkInRepaired]] whileTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2619
                        editor := RCSConflictEditTextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2620
                                    setupWith:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2621
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2622
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2623
                        editor acceptAction:[:dummy |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2624
                            repairedText := editor list.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2625
                            didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2626
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2627
                        didAccept := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2628
                        editor topView openModal.
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
                        didAccept ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2631
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2632
                            ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2633
                                checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2634
                            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2635
                        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2636
                            "/ check if all green-stuff (separators) have been removed
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2637
                            (repairedText contains:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2638
                                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
  2639
                                didAccept := false.
4388
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2640
                            ] ifFalse:[
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2641
                                "/ verify that the edit yields a correct (loadable) source
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2642
                                Error handle:[:ex |
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2643
                                    self warn:(self classResources stringWithCRs:'The edited source code seems to be incorrect\(probably missing exclamation marks or missing quotes)\\I will not check this in, because it will fail to compile/load later.').
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2644
                                    didAccept := false.
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2645
                                ] do:[
4389
20e08f31f335 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4388
diff changeset
  2646
                                    (ChangeSet fromStream:repairedText asString string readStream)
4388
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2647
                                ].
6068318753ee #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4373
diff changeset
  2648
                            ].
4229
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
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2652
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2653
                    checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2654
                        [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2655
                            out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2656
                            out nextPutAll:(repairedText asString string).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2657
                            didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2658
                            out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2659
                        ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2660
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2661
                            checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2662
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2663
                    ]
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
                answer == #option3 ifTrue:[
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
                    "/ force checkin of new version
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
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2671
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2672
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2673
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2674
                    [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2675
                        out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2676
                        self fileOutSourceCodeOf: cls on:out.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2677
                        out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2678
                        didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2679
                        checkInNew := checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2680
                    ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2681
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2682
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2683
                ].
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
                checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2686
                    checkInNew ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2687
                        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
  2688
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2689
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2690
                        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
  2691
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2692
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2693
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2694
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2695
                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2696
                ].
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 startsWith:'U ')
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2699
                 or:[whatHappened startsWith:'P ']) ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2700
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2701
                    "/ nothing changed here, but the repository already contains
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2702
                    "/ a newer version.
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2705
                    self information:'nothing changed in your ''' , className , ''';
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2706
but repository already contains a newer version (repository unchanged).'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2707
                    ^ true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2708
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2709
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2710
                    "/ unexpected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2711
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2712
                    self warn:'unexpected message from CVS:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2713
' , whatHappened , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2714
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2715
No checkin performed.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2716
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2717
                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2718
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2719
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2720
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2721
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
        "/ now check it in again
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
        self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2727
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2728
        logMsg := logMsg replChar:$" withString:'\"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2729
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2730
        OperatingSystem isUNIXlike ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2731
            "/ save the log message into another tempFile ...
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2732
            s := FileStream newTemporaryIn:tempdir.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2733
            s nextPutAll:logMsg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2734
            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2735
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2736
            cmd := 'commit -F "', s fileName baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2737
        ] ifTrue:[
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
            "/ 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
  2740
            "/ CVS V1.9.16 to stdout.
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
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2743
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2744
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2745
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2746
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2747
            inDirectory:tempdir name
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2748
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2749
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2750
                whatHappened := cmdOut contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2751
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2752
                whatHappened := '<< no message >>'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2753
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2754
            self warn:'The following problem was reported by cvs:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2755
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2756
' , whatHappened , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2757
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2758
The class has NOT been checked into the repository.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2759
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2760
            self reportError:'cannot checkin modified class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2761
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2762
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2763
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2764
            whatHappened := cmdOut contentsAsString.
4229
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
            whatHappened := nil
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2767
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2768
    ] ensure:[
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2769
        retryCount := 5.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2770
        OsError handle:[:ex |
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2771
            retryCount := retryCount - 1.
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2772
            retryCount > 1 ifTrue:[
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2773
                Delay waitForSeconds:0.5.
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2774
                ex restart.
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2775
            ].
4459
996c5e249b27 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4454
diff changeset
  2776
            Dialog warn:'Warning: some problem encountered when trying to remove a temporary workfile:
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2777
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2778
%1
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2779
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2780
The checkin was successful, though.
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2781
This may be caused by a virus scanner, or other program which scans the temporary file. 
4487
16a76cd39515 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4485
diff changeset
  2782
Please remove those temporary files later.'
4459
996c5e249b27 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4454
diff changeset
  2783
                        with:ex description.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2784
            ex proceed.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2785
        ] do:[
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2786
            tempdir notNil ifTrue:[ tempdir recursiveRemove. tempdir := nil. ].
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2787
            cmdOut notNil ifTrue:[ cmdOut remove. cmdOut := nil ].
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2788
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2789
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2790
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
    "/ 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
  2793
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2794
    (whatHappened isEmptyOrNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2795
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2796
    ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2797
        whatHappened := whatHappened asCollectionOfLines.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2798
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2799
        idx == 0 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2800
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2801
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2802
            l := whatHappened at:idx.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2803
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2807
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2808
    "/ 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
  2809
    "/   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
  2810
    "/   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
  2811
    "/   the newly checked in version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2812
    "/   (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
  2813
    "/    correctly for all unchanged methodss)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2814
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2815
    "/ 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
  2816
    "/ other version):
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2817
    "/    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
  2818
    "/    and add a 'm' (for merged).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2819
    "/    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
  2820
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2821
    newRevision notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2822
        (didMerge or:[conflictResolvedManually]) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2823
            "/ new code:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2824
            cls revisionString notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2825
                newRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2826
                    '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
  2827
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2828
                    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
  2829
                    newString isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2830
                        '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
  2831
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2832
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2833
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2834
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
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
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2837
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2838
                self activityNotification:'Done.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2839
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2840
                self activityNotification:'CVS: Fetch new revision number of ', cls name.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2841
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2842
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2843
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2844
                    force ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2845
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2846
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2847
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2848
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2849
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2850
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2851
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2852
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2853
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2854
                    self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2855
                    cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2856
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2857
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2858
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2859
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2860
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2861
            "/ 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
  2862
            "/ (to get a new conflict in the next check-in)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2863
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2864
            "/ 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
  2865
            didMerge ifTrue: [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2866
                newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2867
                newString notNil ifTrue:[ self updateVersionMethodOf:cls for:newString ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2868
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2869
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2870
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2871
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2872
    Class addChangeRecordForClassCheckIn:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2873
    self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2874
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2875
    conflictResolvedManually ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2876
        (Dialog
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2877
            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
  2878
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
  2879
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
  2880
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
  2881
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2882
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
  2883
            title:'Code Merged'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2884
            yesLabel:'OK' noLabel:'Update (Load Merged Code)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2885
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2886
            self utilities
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2887
                checkoutClass:cls
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2888
                askForRevision:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2889
                askForMerge:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2890
                askForConfirmation:false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2891
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2892
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2893
    ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2894
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2895
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2896
     SourceCodeManager checkinClass:Array logMessage:'testing only'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2897
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2898
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2899
    "Created: / 13-03-2017 / 15:38:19 / stefan"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2900
    "Modified: / 31-03-2017 / 15:42:32 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2901
    "Modified: / 18-05-2018 / 12:53:43 / Stefan Vogel"
4373
9d345bd900c6 #UI_ENHANCEMENT by Maren
matilk
parents: 4369
diff changeset
  2902
    "Modified: / 09-11-2018 / 18:09:37 / Maren"
4459
996c5e249b27 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4454
diff changeset
  2903
    "Modified: / 10-07-2019 / 18:20:31 / Claus Gittinger"
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2904
!
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2905
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2906
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2907
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2910
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2912
    ^ self 
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2913
        checkoutModule:aModule directory:aPackage 
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2914
        withTag:nil orTimestamp:nil 
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2915
        andDo:aBlock
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2916
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2917
    "Created: / 23-08-2006 / 14:07:05 / cg"
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2918
    "Modified: / 06-03-2012 / 11:57:52 / cg"
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2919
    "Modified: / 02-07-2018 / 12:40:56 / Claus Gittinger"
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2920
!
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2921
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2922
checkoutModule:aModule directory:aPackage withTag:tagOrNil orTimestamp:timestampOrNil andDo:aBlock
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2923
    "check out everything from a package into a temporary directory.
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2924
     If tagOrNil isNonNil, get the versions with that tag;
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2925
     if timestampOrNil isNOnNil, get the version at that date;
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2926
     otherwise, checkout the head.
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2927
     Then evaluate aBlock, passing the name of that temp-directory.
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2928
     Afterwards, the tempDir is removed.
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2929
     Return true, if OK, false if any error occurred."
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2930
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2931
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2932
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2934
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2936
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2938
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2939
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2940
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2941
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2942
    self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2943
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2945
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2946
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2947
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2948
            "/ can redirect output
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  2949
            cmdOut := FileStream newTemporary close; fileName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2950
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2952
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2953
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2954
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2955
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2956
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2957
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2958
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2959
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2960
            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
  2961
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2962
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2963
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2964
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2965
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2966
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2967
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2968
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2969
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2970
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  2972
    "Created: / 02-07-2018 / 12:40:29 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2974
3866
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2975
getSourceStreamFor:aClass revision:aRevisionStringOrNil
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2976
    "extract a classes source code and return an open readStream on it.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2977
     A revision of nil selects the current (in image) revision.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2978
     The classes source code is extracted using the revision and the sourceCodeInfo,
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2979
     which itself is extracted from the classes packageString."
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2980
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2981
    |cacheIt|
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2982
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2983
    "/ never cache symbolic versions
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2984
    cacheIt := (aRevisionStringOrNil isNil or:[ aRevisionStringOrNil first isDigit ]).
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2985
    ^ self getSourceStreamFor:aClass revision:aRevisionStringOrNil cache:cacheIt
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2986
!
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2987
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2988
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2989
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2990
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2991
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2992
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2993
     to validate the correct container against the class.
4312
b71003f7a8d5 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4310
diff changeset
  2994
     To check out a file (i.e. not a classes file), leave cls as nil and provide only a fileName."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2996
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2998
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2999
4340
95215f5aed22 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4336
diff changeset
  3000
    "/ (cls notNil and:[cls name includesString:'ExpeccoTestplan']) ifTrue:[self halt].
95215f5aed22 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4336
diff changeset
  3001
    "/ (fileName notNil and:[fileName asString includesString:'ExpeccoTestplan']) ifTrue:[self halt].
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  3002
    
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  3003
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3004
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3005
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3006
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3007
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3008
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3009
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3010
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3011
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3012
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3013
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3015
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  3016
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  3017
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3018
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3019
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3020
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3021
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3022
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3023
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3024
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3025
    ].
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3026
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3027
        fullName := moduleDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3028
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3029
        fullName := moduleDir , '/' , packageDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3030
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3031
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3032
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3033
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3034
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3035
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3036
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3037
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3038
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3039
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3040
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3041
    "/ 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
  3042
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3043
    "/ 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
  3044
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3045
    "/ (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
  3046
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3047
   (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
  3048
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  3049
            ('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
  3050
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3051
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  3052
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3053
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  3054
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  3055
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  3056
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  3057
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3058
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3059
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3060
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3061
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3062
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3063
    "/ 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
  3064
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3065
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3066
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3067
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3068
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3069
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3070
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3071
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3072
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3073
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3074
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3075
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3076
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3077
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3078
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3079
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3080
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3081
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3082
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3083
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3084
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3085
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3086
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3087
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3088
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3089
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3090
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3091
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3092
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3093
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3094
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3095
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3096
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3097
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3098
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3099
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3100
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3101
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3102
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3103
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3104
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3105
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3106
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3107
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3108
        self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3109
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3110
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3111
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3112
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3113
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3114
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3115
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3116
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3117
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3118
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3119
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3120
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3121
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3122
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3123
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3124
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3125
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3126
"/        "/ 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
  3127
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3128
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3129
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3130
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3131
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3132
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3133
"/            ('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
  3134
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3135
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3136
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3137
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3138
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3139
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3140
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3141
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3142
        ] ifFalse:[
4414
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
  3143
            cacheSubDir 
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
  3144
                recursiveMakeDirectoryForEachCreatedDo:[:dirName| dirName accessRights:cacheDir accessRights].
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
  3145
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3146
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3147
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3148
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3149
            ('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
  3150
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3152
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3153
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3154
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3155
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3156
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3157
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3158
                fullTempName moveTo:fullCachedName.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3159
                self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3160
            ]) ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3161
                self activityNotification:'CVS: Not cached.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3162
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3163
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3164
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3165
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3166
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3167
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3168
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3169
            fileName = 'extensions.st' ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3170
                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
  3171
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3172
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3173
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3174
                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
  3175
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3176
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3177
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3178
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3179
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3180
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3181
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3182
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3183
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3184
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3185
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3186
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3187
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3188
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3189
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3190
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3191
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3192
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3193
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3194
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3195
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3196
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3197
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3198
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3199
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3200
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3203
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3204
    "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
  3205
    "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
  3206
    "Modified: / 20-01-2012 / 16:43:37 / cg"
4340
95215f5aed22 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4336
diff changeset
  3207
    "Modified: / 08-07-2018 / 15:29:17 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3208
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3209
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3210
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3212
checkForExistingContainer:fileName inModule:moduleName directory:packageDirName
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3213
    "check for a container to exist. Return a boolean result."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3214
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3215
    |fullName cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3216
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3217
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3218
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3219
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3220
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3221
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3222
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3224
    packageDirName isEmptyOrNil ifTrue:[
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3225
        fullName := moduleName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3226
    ] ifFalse:[ 
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3227
        fullName := moduleName , '/' , packageDirName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3228
    ].
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3229
    
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3230
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3235
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3236
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3237
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3238
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3240
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3243
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3244
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3245
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3246
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3247
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3248
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3249
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3250
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3251
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3252
    "/ 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
  3253
    "/ (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
  3254
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3255
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3256
    cmd := '-n rtag -F dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3257
    ^ [  
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3258
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3259
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3260
        
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3261
        SourceCodeManagerError handle:[:ex |
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3262
            ^ false.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3263
        ] do:[    
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3264
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3265
                executeCVSCommand:cmd , fullName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3266
                module:moduleName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3267
                "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3268
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3269
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3270
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3271
                log:false
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3272
                outputTo:outputStream
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3273
                errorTo:errorStream.
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3274
    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3275
            "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
  3276
             is returned even if the file does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3277
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3278
            "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
  3279
            "/ cg: read comment above.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3280
            errorStream isEmpty 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3281
                or:[errorStream contents asCollectionOfLines 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3282
                       allSatisfy:[:l | l isBlank or:[l includesString:'WARNING:']]].
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3283
        ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3286
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3289
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3290
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3291
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3292
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3294
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3295
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3296
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3297
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3299
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3300
    "Created: / 13-09-2006 / 18:20:36 / cg"
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3301
    "Modified (format): / 24-02-2017 / 11:32:37 / cg"
4257
9e51055344d5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4256
diff changeset
  3302
    "Modified: / 21-09-2017 / 11:00:40 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3303
    "Modified: / 18-05-2018 / 13:42:15 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3304
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3306
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3307
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3308
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3309
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3310
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3311
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3312
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3313
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3314
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3315
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3316
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3317
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3318
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3319
    self activityNotification:'CVS: Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3320
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3321
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3322
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3323
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3324
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3325
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3326
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3327
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3328
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3329
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3331
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3332
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3333
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3334
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3335
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3336
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3337
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3338
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3339
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3340
        cmd := '-n rtag -l dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3341
        ret := [
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3342
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3343
                executeCVSCommand:cmd , moduleDir 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3344
                module:moduleDir
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3345
                "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3346
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3347
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3348
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3349
                log:false.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3350
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3351
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3352
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3354
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3355
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3356
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3357
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3358
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3359
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3363
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3365
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3366
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3367
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3368
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3369
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3370
    "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
  3371
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3372
    "Modified: / 19-08-2011 / 10:38:35 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3373
    "Modified: / 18-05-2018 / 12:49:05 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3375
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3376
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3377
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3378
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3379
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3380
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3381
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3382
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3383
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3384
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3385
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3386
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3387
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3388
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3389
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3391
    self activityNotification:'CVS: Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3393
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3394
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3395
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3396
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3397
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3398
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3399
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3400
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3401
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3402
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3403
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3404
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3405
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3406
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3407
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3408
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3409
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3410
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3411
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3412
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3413
        cmd := '-n rtag -l -F dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3414
        ret := [
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3415
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3416
                executeCVSCommand:cmd, fullName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3417
                module:moduleDir
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3418
                "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3419
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3420
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3421
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3422
                log:false.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3423
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3424
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3428
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3429
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3430
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3431
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3432
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3443
    "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
  3444
    "Created: / 23-08-2006 / 14:03:03 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3445
    "Modified: / 18-05-2018 / 12:49:39 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3448
createBranch:branchName forClasses:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3449
    "create a branch"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3450
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3451
    self setSymbolicName:(self branchStartTagFor:branchName) asBranch:true revision:nil overWrite:false classes:aCollectionOfClasses
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3452
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3453
    "Created: / 04-12-2017 / 18:47:06 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3454
    "Modified: / 07-12-2017 / 10:24:42 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3455
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3456
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3457
createBranch:branchName pathes:aCollectionOfPathNames
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3458
    "create a branch"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3459
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3460
    self setSymbolicName:(self branchStartTagFor:branchName) asBranch:true revision:nil overWrite:false pathes:aCollectionOfPathNames
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3461
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3462
    "Created: / 04-12-2017 / 18:56:30 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3463
    "Modified: / 07-12-2017 / 10:24:47 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3464
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3465
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3473
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3474
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3475
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3476
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  3478
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3480
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3481
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3482
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3483
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3484
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3492
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3494
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3517
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3530
    self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3557
    self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
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
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3581
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
    ].
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3596
    whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3607
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
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
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3631
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
    "/ (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
  3646
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3663
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3674
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3675
    "Modified: / 12-11-2010 / 11:04:42 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3676
    "Modified: / 09-05-2018 / 19:26:53 / stefan"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  3686
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3688
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3689
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3690
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3691
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3692
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3700
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3730
        self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3734
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3741
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3754
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3755
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3756
        self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3757
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
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
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3780
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
        ].
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3794
        whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3795
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3796
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3797
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3798
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3799
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3805
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3808
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3809
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3836
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3837
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3838
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3841
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3842
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3843
    "Modified: / 12-11-2010 / 11:04:55 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3844
    "Modified: / 09-05-2018 / 19:27:06 / stefan"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3850
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3856
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3857
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3858
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3859
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  3861
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3863
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3878
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3879
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3880
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3883
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3884
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3885
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3890
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3893
    "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
  3894
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3895
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3896
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3897
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3898
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3905
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3906
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3907
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3908
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3909
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3910
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3911
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
        ('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
  3916
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3918
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  3924
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3933
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3934
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3935
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3936
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3937
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3938
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3939
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3942
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3943
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3944
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3946
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3947
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3948
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3949
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3950
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3951
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3952
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3953
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3954
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3955
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3956
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3957
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3958
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3959
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3960
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3961
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3962
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3963
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3965
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3966
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3967
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3968
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3969
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3970
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3971
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3972
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3973
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3974
    "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
  3975
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3976
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3977
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3978
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3979
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
  3980
    "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
  3981
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3982
    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
  3983
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3984
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3985
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3986
        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
  3987
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3988
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3989
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3990
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
  3991
    "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
  3992
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3993
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3994
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3995
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3996
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3997
     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
  3998
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3999
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4000
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4001
    "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
  4002
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4003
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4004
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4005
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4006
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4007
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4008
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4009
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4010
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4011
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4012
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4013
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4014
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4015
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4016
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4017
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4018
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4019
    "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
  4020
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4021
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4022
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4023
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4024
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4025
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4026
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4027
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4028
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4029
    "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
  4030
     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
  4031
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4032
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4033
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4034
    self activityNotification:'CVS: Fetching list of directories...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4035
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4036
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4037
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4038
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4039
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4040
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4041
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4042
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4043
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4044
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4045
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4046
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4047
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4048
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4049
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4050
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4051
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4052
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4053
    |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
  4054
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4055
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4056
    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
  4057
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4058
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4059
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4060
                        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
  4061
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4062
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4063
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4064
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4065
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4066
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4067
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4068
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4069
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4070
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4071
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4072
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4073
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4074
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4075
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4076
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4077
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4078
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4079
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4080
                "/ '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
  4081
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4082
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4083
                    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
  4084
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4085
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4086
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4087
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4088
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4089
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4090
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4091
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4092
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4093
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4094
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4095
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4096
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4097
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4098
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4099
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4100
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4101
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4102
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4103
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4104
     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
  4105
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4106
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4107
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4108
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4109
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4110
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4111
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4112
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4113
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4114
    self activityNotification:'CVS: Fetching list of containers...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4115
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4116
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4117
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4118
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4119
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4120
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4121
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4122
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4123
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4124
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4125
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4126
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4127
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4128
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4129
newestRevisionInFile:classFileName directory:packageDirOrNil module:moduleDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4130
    "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
  4131
     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
  4132
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4133
    |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
  4134
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4135
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4136
         "/ 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
  4137
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4138
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4139
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4140
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4141
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4142
                fileName:classFileName 
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4143
                directory:packageDirOrNil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4144
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4145
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4146
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4147
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4148
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4149
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4150
    packageDirOrNil isEmptyOrNil ifTrue:[
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4151
        modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4152
    ] ifFalse:[
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4153
        modulePath :=  moduleDir , '/' , packageDirOrNil. 
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4154
    ].        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4155
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4156
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4157
    [
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4158
        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
  4159
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4160
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4161
                        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
  4162
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4163
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4164
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4165
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4166
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4167
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4168
            ('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
  4169
            "/ 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
  4170
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4171
                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
  4172
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4173
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4174
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4175
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4176
            "/ 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
  4177
            "/ 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
  4178
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4179
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4180
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4181
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4182
                log:true 
4100
fcabc1395987 #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 4094
diff changeset
  4183
                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
  4184
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4185
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4186
            "/ 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
  4187
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4188
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4189
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4190
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4191
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4192
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4193
                        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
  4194
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4195
                            (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
  4196
                                "/ 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
  4197
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4198
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4199
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4200
                        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
  4201
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4202
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4203
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4204
                                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
  4205
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4206
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4207
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4208
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4209
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4210
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4211
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4212
        ('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
  4213
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4214
        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
  4215
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4216
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4217
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4218
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4219
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4220
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4221
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4222
    "Modified: / 06-03-2012 / 11:55:33 / cg"
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4223
    "Modified (format): / 15-05-2019 / 14:06:46 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4224
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4225
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4226
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4227
    "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
  4228
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4229
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4230
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4231
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4232
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4233
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4234
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4235
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4236
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4237
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  4238
     SourceCodeManager 
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  4239
        newestRevisionsInModule:'stx' directory:'goodies/net'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4240
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4241
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4242
    "Created: / 12-10-2006 / 10:12:59 / cg"
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  4243
    "Modified (comment): / 02-07-2018 / 12:38:06 / Claus Gittinger"
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4244
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4245
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4246
pathesForClasses:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4247
    "helper - collect the pathnames for a collection of classes"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4248
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4249
    |paths alreadyWarned|
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4250
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4251
    alreadyWarned := 0.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4252
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4253
    paths := aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4254
                collect:[:cls |
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4255
                    |info path answer|
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4256
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4257
                    cls isLoaded ifFalse:[
4401
414d2875e720 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4389
diff changeset
  4258
                        Transcript showCR:'Cannot handle unloaded class: %1.' with:cls name.
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4259
                        alreadyWarned == 0 ifTrue:[
4459
996c5e249b27 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4454
diff changeset
  4260
                            Dialog warn:'Cannot handle unloaded class: %1.' with:cls name.
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4261
                            alreadyWarned := alreadyWarned + 1.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4262
                        ] ifFalse:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4263
                            alreadyWarned == 1 ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4264
                                answer := Dialog confirmWithCancel:('Cannot handle unloaded class: %1.\\Suppress further warnings?' withCRs bindWith:cls name).
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4265
                                answer isNil ifTrue:[^ self].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4266
                                answer == true ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4267
                                    alreadyWarned := alreadyWarned + 1.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4268
                                ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4269
                            ]
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4270
                        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4271
                        nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4272
                    ] ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4273
                        info := self sourceInfoOfClass:cls.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4274
                        info isNil ifTrue:[
4401
414d2875e720 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4389
diff changeset
  4275
                            Dialog warn:'No source info for: %1 (not in repository?)' with:cls name.
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4276
                            nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4277
                        ] ifFalse:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4278
                            path := info at:#pathInRepository ifAbsent:nil.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4279
                            path isNil ifTrue:[
4401
414d2875e720 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4389
diff changeset
  4280
                                Dialog warn:'No source info for: %1 (not in repository?)' with:cls name.
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4281
                            ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4282
                            path
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4283
                        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4284
                    ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4285
                ]
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4286
                thenSelect:[:path | path notNil].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4287
    ^ paths
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4288
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4289
    "Created: / 04-12-2017 / 18:48:30 / cg"
4459
996c5e249b27 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4454
diff changeset
  4290
    "Modified: / 10-07-2019 / 18:20:48 / Claus Gittinger"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4291
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4292
4435
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4293
readRevisionLogFromStream:aCVSLogPipeStream headerOnly:headerOnly numRevisions:numRevisionsOrNil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4294
    |info inHeaderInfo line numberOfRevisionsString idx selectedRevisions revisionRecords atEnd|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4295
    
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4296
    "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4297
    "/ read the command's pipe output and extract the container info
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4298
    "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4299
    info := IdentityDictionary new.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4300
    inHeaderInfo := true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4301
    [inHeaderInfo and:[aCVSLogPipeStream atEnd not]] whileTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4302
        line:= aCVSLogPipeStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4303
        line notNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4304
            |gotIt|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4305
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4306
            gotIt := false.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4307
            #('RCS file:'        #container
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4308
              'Working file:'    #filename
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4309
              'head:'            #newestRevision
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4310
              'total revisions:' #numberOfRevisions
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4311
             ) pairWiseDo:[:word :key |
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4312
                |s|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4313
                
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4314
                gotIt ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4315
                    s := line restAfter:word withoutSeparators:true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4316
                    s notNil ifTrue:[info at:key put:s. gotIt := true].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4317
                ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4318
            ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4319
            gotIt ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4320
                (line startsWith:'symbolic names:') ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4321
                    |tags tokens|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4322
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4323
                    tags := Dictionary new.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4324
                    line:= aCVSLogPipeStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4325
                    [line notNil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4326
                     and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4327
                        tokens := line asCollectionOfSubstringsSeparatedBy:$:.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4328
                        tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4329
                        line:= aCVSLogPipeStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4330
                    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4331
                    info at:#symbolicNames put:tags.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4332
                ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4333
                (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4334
            ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4335
        ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4336
    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4337
    aCVSLogPipeStream nextLine. "/ skip separating line after description.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4338
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4339
    info isEmpty ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4340
        ^ nil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4341
    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4342
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4343
    "/ strip selected revisions from the total-revisions entry
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4344
    numberOfRevisionsString := info at:#numberOfRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4345
    (idx := numberOfRevisionsString indexOf:$;) ~~ 0 ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4346
        info at:#numberOfRevisions put:(Integer readFrom:(numberOfRevisionsString copyTo:idx - 1)).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4347
        idx := numberOfRevisionsString indexOf:$: startingAt:idx.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4348
        selectedRevisions := Integer readFrom:(numberOfRevisionsString copyFrom:idx+1) onError:0.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4349
    ] ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4350
        info at:#numberOfRevisions put:(Integer readFrom:numberOfRevisionsString onError:1).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4351
        selectedRevisions := 0.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4352
    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4353
    info at:#numberOfSelectedRevisions put:selectedRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4354
    
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4355
    headerOnly ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4356
        "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4357
        "/ continue to read the commands pipe output
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4358
        "/ and extract revision info records
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4359
        "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4360
        aCVSLogPipeStream atEnd ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4361
            selectedRevisions > 0 ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4362
                "/ suppress warning. if we try to get the info of a non-existing revision"
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4363
                "/ ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4364
            ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4365
            ^ info
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4366
        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4367
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4368
        revisionRecords := OrderedCollection new:selectedRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4369
        info at:#revisions put:revisionRecords.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4370
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4371
        atEnd := false.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4372
        [atEnd or:[aCVSLogPipeStream atEnd]] whileFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4373
            |record|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4374
            
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4375
            record := self readRevisionLogEntryFromStream:aCVSLogPipeStream.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4376
            record isNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4377
                atEnd := true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4378
            ] ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4379
                revisionRecords add:record.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4380
            ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4381
            (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4382
                atEnd := true
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4383
            ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4384
        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4385
    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4386
    ^ info
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4387
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4388
    "Created: / 28-05-2019 / 13:54:26 / Claus Gittinger"
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4389
!
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4390
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4391
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4394
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4396
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4397
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4398
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4399
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4400
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4405
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4412
    self activityNotification:'CVS: Removing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4414
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4415
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4417
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4421
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4422
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4423
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4424
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4425
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4426
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4427
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4428
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4429
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  4430
    cmdOut := FileStream newTemporary close; fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4431
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4440
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4444
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4448
    self activityNotification:'CVS Committing removal of ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4457
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4465
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4466
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4467
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4468
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4469
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4474
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4475
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4476
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4477
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4478
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4479
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4480
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4482
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4483
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4484
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4485
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4486
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4487
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4488
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4489
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4490
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4491
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4492
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4493
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4494
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4495
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4496
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4497
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4498
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4499
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4500
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4501
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4502
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4503
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4504
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4505
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4506
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4507
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4508
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4509
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4510
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4511
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4512
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4513
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4514
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4515
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4516
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4517
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4518
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4519
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4520
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4521
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4522
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4523
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4524
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4525
    "process a full historyLog, evaluate aBlock for each entry, passing 
4419
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4526
     each logs' info in a dictionary.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4527
     This walks over all possible repositories.
4419
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4528
     filterRep may be a collection of repository names (eg. 'stx', 'exept', 'phx' etc.) to only report changes made to one
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4529
     of those repositories.
4419
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4530
     userFilter, if a non-nil string or stringCollection, 
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4531
     will filter only changes made by that user(s) (eg. 'sv' or #('sv' 'cg')).
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4532
     filterModules, if non-empty, will only present changes in that module (eg. 'stx:libbasic')"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4533
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4534
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4535
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4536
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4537
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4538
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4539
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4540
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4541
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4542
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4543
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4544
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4545
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4546
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4547
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4549
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4550
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4551
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4552
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4553
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4554
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4555
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4556
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4557
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4558
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4559
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4560
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4561
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4562
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4563
        cmd := cmd , ' history -x ARMT -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4564
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4565
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4566
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4567
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4568
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4569
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4570
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4571
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4572
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4573
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4574
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4575
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4576
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4577
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4578
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4579
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4580
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4581
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4582
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4583
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4584
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4585
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4587
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4588
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4589
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4590
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4591
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4592
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4593
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4594
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4595
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4596
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4597
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4598
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4599
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4600
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4601
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4602
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4603
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4604
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4605
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4606
                        words := line asCollectionOfWords.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4607
                        words size < 7 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4608
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4609
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4610
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4611
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4612
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4613
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4614
                            recordType = 'T' ifTrue:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4615
                                rev := words at:7.   "something like [expecco_2_8_0:HEAD]"
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4616
                                module := fileName := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4617
                                fileName := fileName copyAfterLast:$/.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4618
                            ] ifFalse:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4619
                                rev := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4620
                                fileName := words at:7.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4621
                                pkgDir := words at:8.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4622
                                module := pkgDir.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4623
                            ].
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4624
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4625
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4626
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4627
                                    time := words at:3.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4628
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4629
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4630
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4631
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4632
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4633
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4634
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4635
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4636
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4637
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4638
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4639
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4640
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4641
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4642
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4643
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4644
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4645
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4646
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4647
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4648
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4649
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4650
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4651
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4652
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4653
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4654
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4655
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4656
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4657
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4658
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4659
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4660
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4661
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4662
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4663
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4664
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4665
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4666
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4667
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4668
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4669
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4670
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4671
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4672
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4673
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4674
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4675
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4676
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4677
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4678
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4679
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4680
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4681
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4682
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4683
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4685
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4686
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4687
    "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
  4688
    "Modified: / 29-08-2006 / 13:17:50 / cg"
4419
ea0144a6e7fe #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4414
diff changeset
  4689
    "Modified (comment): / 08-05-2019 / 10:22:27 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4690
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4691
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4692
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4693
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4694
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4695
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4696
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4697
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4698
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4699
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4701
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4702
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4703
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4704
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4705
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4706
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4707
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4709
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4710
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4712
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4713
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4714
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4715
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4716
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4717
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4718
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4719
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4720
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4721
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4722
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4723
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4724
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4725
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4726
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4727
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4728
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4729
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4730
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4731
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4732
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4733
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4734
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4735
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4736
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4737
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4738
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4739
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4740
            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
  4741
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4742
            "/ 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
  4743
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4744
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4745
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4746
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4747
            "/ temporary fix Felix' bad string translation:
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4748
            (aString startsWith:'§Header:') ifTrue:[
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4749
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4750
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4751
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4752
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4753
                        autoFixHolder value ifFalse:[
4487
16a76cd39515 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4485
diff changeset
  4754
                            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
  4755
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4756
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4757
                        (autoFixHolder value 
4487
16a76cd39515 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4485
diff changeset
  4758
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" ("§"-bug). Fix it?' bindWith:aClass name) ]
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4759
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4760
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4761
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4762
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4763
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4764
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4765
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  4766
            "/ 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
  4767
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4768
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4769
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4770
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4771
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4772
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4773
                            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
  4774
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4775
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4776
                        (autoFixHolder value 
4487
16a76cd39515 #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4485
diff changeset
  4777
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Umlaut remover-bug). Fix it?' bindWith:aClass name) ]
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4778
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4779
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4780
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4781
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4782
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4783
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4784
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4785
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4786
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4787
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4788
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4789
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4790
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4791
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4792
                            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
  4793
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4794
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4795
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4796
                            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
  4797
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4798
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4799
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4800
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4801
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4802
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4803
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4804
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4805
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4806
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4807
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4808
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4809
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4810
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4811
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4812
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4813
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4814
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4815
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4816
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4817
revisionLogOf:clsOrNil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4818
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4819
    fileName:classFileName directory:packageDirOrNil module:moduleDirOrNil
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4820
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4821
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4822
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4823
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4824
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4825
     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
  4826
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4827
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4828
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4829
     filled with:
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4830
            #container          -> the CVS container file name
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4831
            #cvsRoot            -> the CVS root (repository)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4832
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4833
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4834
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4835
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4836
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4837
            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
  4838
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4839
              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
  4840
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4841
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4842
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4843
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4844
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4845
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4846
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4848
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4849
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4850
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4851
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4852
              #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
  4853
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4854
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4855
            revisions are ordered newest first
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4856
            (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
  4857
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4858
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4859
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4860
    |tempDir tempDirToRemove fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4861
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4862
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4863
    self use_rlog ifFalse:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4864
        tempDir := tempDirToRemove := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4865
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4866
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4867
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4868
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4869
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4870
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4871
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4872
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4873
4426
a82374e79e97 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4425
diff changeset
  4874
        packageDirOrNil isEmptyOrNil ifTrue:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4875
            modulePath := moduleDirOrNil
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4876
        ] ifFalse:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4877
            modulePath := moduleDirOrNil , '/' , packageDirOrNil.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4878
        ].
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4879
        classFileName isNil ifTrue:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4880
            fullName := modulePath , '/' , (clsOrNil classFilename).
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4881
        ] ifFalse:[    
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4882
            modulePath isNil ifTrue:[
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4883
                fullName := classFileName asFilename pathName.
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4884
            ] ifFalse:[    
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4885
                fullName := modulePath , '/' , classFileName.
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4886
            ].
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4887
        ].
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4888
        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4889
        self use_rlog ifFalse:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4890
            self createEntryFor:fullName
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4891
                 module:moduleDirOrNil
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4892
                 in:(tempDir construct:modulePath)
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4893
                 revision:'1.1'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4894
                 date:'dummy'
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4895
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4896
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4897
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4898
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4899
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4900
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4901
        (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
  4902
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4903
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4904
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4905
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4906
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4907
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4908
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4909
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4910
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4911
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4912
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4913
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4914
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4915
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4916
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4917
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4918
            msg := 'CVS: Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4919
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4920
            msg := 'CVS: Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4921
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4922
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4923
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4924
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4925
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4926
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4927
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4928
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4929
        (self use_rlog and:[moduleDirOrNil notNil]) ifTrue:[
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4930
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4931
        ] ifFalse:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4932
            fullName asFilename isAbsolute ifTrue:[
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4933
                tempDir := fullName asFilename directory pathName.
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4934
                tempDirToRemove := nil.
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4935
                cmd := ('log ' , revArg , ' ' , fullName asFilename baseName).
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4936
            ] ifFalse:[    
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4937
                cmd := ('log ' , revArg , ' ' , fullName).
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4938
            ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4939
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4940
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4941
        inStream := self
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4942
                        executeCVSCommand:cmd
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  4943
                        module:moduleDirOrNil
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4944
                        inDirectory:tempDir
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4945
                        log:true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4946
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4947
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4948
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4949
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4950
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
4467
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  4951
            inStream notNil ifTrue:[ inStream close ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4952
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4953
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4954
4435
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4955
        info := self readRevisionLogFromStream:inStream headerOnly:headerOnly numRevisions:numRevisionsOrNil.
4467
982a87cfa97d #REFACTORING by exept
Claus Gittinger <cg@exept.de>
parents: 4459
diff changeset
  4956
        inStream close.
4435
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4957
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4958
"/        "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4959
"/        "/ read the command's pipe output and extract the container info
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4960
"/        "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4961
"/        info := IdentityDictionary new.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4962
"/        inHeaderInfo := true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4963
"/        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4964
"/            line:= inStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4965
"/            line notNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4966
"/                |gotIt|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4967
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4968
"/                gotIt := false.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4969
"/                #('RCS file:'        #container
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4970
"/                  'Working file:'    #filename
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4971
"/                  'head:'            #newestRevision
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4972
"/                  'total revisions:' #numberOfRevisions
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4973
"/                 ) pairWiseDo:[:word :key |
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4974
"/                    gotIt ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4975
"/                        s := line restAfter:word withoutSeparators:true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4976
"/                        s notNil ifTrue:[info at:key put:s. gotIt := true].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4977
"/                    ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4978
"/                ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4979
"/                gotIt ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4980
"/                    (line startsWith:'symbolic names:') ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4981
"/                        |tags tokens|
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4982
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4983
"/                        tags := Dictionary new.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4984
"/                        line:= inStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4985
"/                        [line notNil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4986
"/                         and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4987
"/                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4988
"/                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4989
"/                            line:= inStream nextLine.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4990
"/                        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4991
"/                        info at:#symbolicNames put:tags.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4992
"/                    ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4993
"/                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4994
"/                ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4995
"/            ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4996
"/        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4997
"/        inStream nextLine. "/ skip separating line after description.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4998
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  4999
"/        info isEmptyOrNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5000
"/            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5001
"/            ^ nil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5002
"/        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5003
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5004
"/        "/ strip selected revisions from the total-revisions entry
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5005
"/        s := info at:#numberOfRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5006
"/        (idx := s indexOf:$;) ~~ 0 ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5007
"/            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5008
"/            idx := s indexOf:$: startingAt:idx.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5009
"/            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5010
"/        ] ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5011
"/            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5012
"/            selectedRevisions := 0.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5013
"/        ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5014
"/        info at:#numberOfSelectedRevisions put:selectedRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5015
"/        headerOnly ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5016
"/            "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5017
"/            "/ continue to read the commands pipe output
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5018
"/            "/ and extract revision info records
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5019
"/            "/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5020
"/            inStream atEnd ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5021
"/                selectedRevisions > 0 ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5022
"/                    "/ suppress warning. if we try to get the info of a non-existing revision"
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5023
"/                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5024
"/                ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5025
"/                ^ info
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5026
"/            ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5027
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5028
"/            revisionRecords := OrderedCollection new:selectedRevisions.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5029
"/            info at:#revisions put:revisionRecords.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5030
"/
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5031
"/            atEnd := false.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5032
"/            [atEnd or:[inStream atEnd]] whileFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5033
"/                record := self readRevisionLogEntryFromStream:inStream.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5034
"/                record isNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5035
"/                    atEnd := true.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5036
"/                ] ifFalse:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5037
"/                    revisionRecords add:record.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5038
"/                ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5039
"/                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5040
"/                    atEnd := true
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5041
"/                ]
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5042
"/            ].
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5043
"/        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5044
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5045
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5046
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5047
        tempDirToRemove notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5048
            OsError handle:[:ex |
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5049
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDirToRemove pathName) infoPrintCR.
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5050
            ] do:[
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5051
                tempDirToRemove recursiveRemove
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5052
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5053
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  5054
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5055
    ].
4435
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5056
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5057
    info isEmptyOrNil ifTrue:[
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5058
        ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5059
        ^ nil
96b57ec6ddb9 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4426
diff changeset
  5060
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5061
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5062
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5063
    "
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5064
     SourceCodeManager revisionLogOf:Array
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5065
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5066
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5067
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5068
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5069
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5070
     SourceCodeManager revisionLogOfFile:'../../libbasic/Array.st' fromRevision:0 toRevision:0
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5071
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5072
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5073
    "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
  5074
    "Modified: / 29-01-1997 / 16:51:30 / stefan"
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  5075
    "Modified: / 06-12-2017 / 11:46:41 / cg"
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5076
    "Modified: / 07-07-2019 / 23:38:57 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5077
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5078
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5079
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5080
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5081
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5082
     each filled with:
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5083
            #container          -> the CVS container file name 
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5084
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5085
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5086
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5087
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5088
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5089
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5090
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5091
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5092
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5093
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5094
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5095
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5096
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5097
             -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
  5098
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5099
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5100
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5101
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5102
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5103
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5104
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5105
              #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
  5106
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5107
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5108
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5109
            (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
  5110
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5111
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5112
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5113
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5114
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5115
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5116
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5117
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5118
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5119
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5120
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5121
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5122
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5123
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5124
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5125
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5126
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5127
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5128
        ].
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5129
        self use_rlog ifFalse:[
4310
0b4045ea2154 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4298
diff changeset
  5130
            self halt:'non-rlog no longer supported'.
0b4045ea2154 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4298
diff changeset
  5131
            ^ self.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5132
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5133
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5134
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5135
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5136
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5137
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5138
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5139
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5140
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5141
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5142
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5143
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5144
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5145
            msg := 'CVS: Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5146
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5147
            msg := 'CVS: Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5148
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5149
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5150
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5151
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5152
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5153
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5154
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5155
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5156
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5157
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5158
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5159
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5160
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5161
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5162
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5163
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5164
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5165
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5166
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5167
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5168
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5169
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5170
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5171
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5172
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5173
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5174
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5175
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5176
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5177
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5178
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5179
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5180
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5181
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5182
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5183
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5184
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5185
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5186
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5187
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5188
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5189
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5190
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5191
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5192
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5193
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5194
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5195
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5196
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5197
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5198
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5199
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5200
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5201
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5202
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5203
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5204
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5205
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5206
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5207
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5208
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5209
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5210
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5211
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5212
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5213
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5214
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5215
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5216
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5217
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5218
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5219
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5220
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5221
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5222
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5223
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5224
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5225
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5226
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5227
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5228
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5229
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5230
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5231
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5232
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5233
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5234
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5235
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5236
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5237
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5238
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5239
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5240
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5241
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5242
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5243
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5244
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5245
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5246
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5247
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5248
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5249
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5250
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5251
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  5252
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5253
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5254
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5255
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5256
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5257
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5258
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5259
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5260
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5261
            OsError handle:[:ex |
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5262
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5263
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5264
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5265
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5266
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5267
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5268
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5269
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5270
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5271
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5272
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5273
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5274
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5275
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5276
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5277
    "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
  5278
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5279
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5280
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5281
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5282
    tempDir := nil.         "use the current directory"
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5283
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5284
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5285
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5286
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5287
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5288
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5289
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5290
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5291
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5292
    ].
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5293
    self activityNotification:('CVS: Fetching revision infos for %1%2'
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5294
                                    bindWith:modulePath
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5295
                                    with:(' from ',(aDateOrNilForNewest ? 'newest'))).
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5296
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5297
    info := [
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5298
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5299
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5300
        self activityNotification:('CVS: Fetching revision infos for %1%2'
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5301
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5302
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5303
                                                ifTrue:[ '' ]
4336
d5a9051236fb #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 4327
diff changeset
  5304
                                                ifFalse:[ ' of ',(aDateOrNilForNewest printStringFormat:'%y-%m-%d')])).
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5305
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5306
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5307
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5308
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5309
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5310
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5311
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5312
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5313
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5314
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5315
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5316
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5317
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5318
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5319
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5320
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5321
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5322
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5323
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5324
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5325
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5326
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5327
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5328
        self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5329
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5330
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5331
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5332
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5333
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5334
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5335
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5336
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5337
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5338
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5339
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5340
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5341
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5342
    "Created: / 12-10-2006 / 10:12:59 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5343
    "Modified: / 18-05-2018 / 12:50:53 / Stefan Vogel"
4454
fdd347565a6c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4435
diff changeset
  5344
    "Modified: / 07-07-2019 / 20:19:08 / Claus Gittinger"
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5345
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5346
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5347
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5348
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5349
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5350
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5351
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5352
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5353
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5354
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5355
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5356
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5357
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5358
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5359
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5360
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5361
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5362
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5363
    ].        
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5364
    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
  5365
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5366
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5367
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5368
    info := [
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5369
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5370
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5371
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5372
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5373
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5374
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5375
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5376
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5377
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5378
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5379
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5380
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5381
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5382
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5383
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5384
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5385
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5386
        "/
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5387
        self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5388
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5389
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5390
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5391
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5392
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5393
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5394
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5395
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5396
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5397
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5398
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5399
    "Created: / 12-10-2006 / 10:12:59 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5400
    "Modified: / 18-05-2018 / 12:51:12 / Stefan Vogel"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5401
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5402
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5403
setSymbolicName:symbolicName asBranch:asBranch revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5404
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5405
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5406
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5407
     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
  5408
     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
  5409
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5410
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5411
4294
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5412
    |paths|
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5413
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5414
    paths := self pathesForClasses:aCollectionOfClasses.
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5415
    self setSymbolicName:symbolicName asBranch:asBranch revision:rev overWrite:overWriteBool pathes:paths
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5416
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5417
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5418
     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
  5419
     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
  5420
     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
  5421
     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
  5422
     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
  5423
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5424
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5425
    "Created: / 04-12-2017 / 18:53:08 / cg"
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5426
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5427
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5428
setSymbolicName:symbolicNameArg asBranch:asBranch revision:rev overWrite:overWriteBool pathes:pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5429
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5430
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5431
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5432
     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
  5433
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5434
     If multiple paths are given, the revision MUST be nil."
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5435
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5436
    |argumentString result errorStream outStream moduleDirs symbolicName cvsErrorOutput cvsOutput|
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5437
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5438
    symbolicName := (symbolicNameArg includes:Character space)
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5439
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5440
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5441
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5442
    pathsInRepository size > 1 ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5443
        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
  5444
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5445
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5446
    moduleDirs := pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5447
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5448
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5449
                    ] as:Set.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5450
    moduleDirs do:[:moduleDir |
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5451
        |pathsInModule pathsInModuleAsArgument|
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5452
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5453
        pathsInModule := pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5454
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5455
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5456
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5457
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5458
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5459
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5460
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5461
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5462
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5463
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5464
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5465
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5466
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5467
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5468
        ].
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5469
        asBranch ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5470
            argumentString := '-b ',argumentString.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5471
        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5472
        
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5473
        pathsInModuleAsArgument := pathsInModule
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5474
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5475
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5476
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5477
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5478
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5479
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5480
                                        ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5481
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5482
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5483
        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
  5484
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5485
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5486
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5487
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5488
        result := self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5489
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathsInModuleAsArgument)
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5490
                    module:moduleDir
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5491
                    inDirectory:nil
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5492
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5493
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5494
                    errorTo:errorStream.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5495
                    
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5496
        self activityNotification:nil.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5497
        cvsErrorOutput := errorStream contents.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5498
        (result not or:[errorStream size ~~ 0]) ifTrue:[
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5499
            SourceCodeManagerError raiseRequestWith:cvsErrorOutput errorString:' cvs tag failed: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5500
        ] ifFalse:[
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5501
            cvsOutput := outStream contents.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5502
            (cvsOutput asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5503
                SourceCodeManagerError raiseRequestWith:cvsOutput errorString:' cvs tag could not be set: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5504
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5505
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5506
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5507
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5508
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5509
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5510
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5511
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5512
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5513
        setSymbolicName:'test1'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5514
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5515
        overWrite:true
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5516
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5517
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5518
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5519
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5520
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5521
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5522
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5523
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5524
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5525
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5526
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5527
        revision:0
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5528
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5529
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5530
                  '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
  5531
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5532
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5533
    "Created: / 04-12-2017 / 18:52:14 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  5534
    "Modified (comment): / 07-12-2017 / 10:20:02 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5535
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5536
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5537
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5538
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5539
     If rev is nil, set it for the head (most recent) revision.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5540
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5541
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5542
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5543
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5544
     If filename is nil, the symbolicName for a whole package is set"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5545
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5546
    self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5547
        setSymbolicName:symbolicName 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5548
        revision:rev 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5549
        overWrite:overWriteBool 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5550
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5551
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5552
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5553
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5554
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5555
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5556
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5557
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5558
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5559
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5560
    "Created: / 12-09-2006 / 12:56:52 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5561
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5562
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5563
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5564
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5565
     If rev is nil, set it for the head (most recent) revision.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5566
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5567
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5568
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5569
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5570
     If filename is nil, the symbolicName for a whole package is set"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5571
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5572
    self setSymbolicName:symbolicName asBranch:false revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5573
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5574
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5575
     self setSymbolicName:'foo' revision:nil overWrite:false classes:(Array with:True with:False)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5576
     self setSymbolicName:'foo' revision:nil overWrite:true classes:(Array with:True with:False)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5577
     self setSymbolicName:'foo' revision:nil overWrite:true classes:(Array with:True with:False)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5578
     self setSymbolicName:'foo' revision:'1.1' overWrite:true classes:(Array with:True with:False)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5579
     self setSymbolicName:'foo' revision:0 overWrite:true classes:(Array with:True with:False)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5580
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5581
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5582
    "Created: / 12-09-2006 / 12:58:23 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5583
    "Modified: / 04-12-2017 / 18:53:26 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5584
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5585
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5586
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool path:pathInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5587
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5588
     If rev is nil, set it for the head (most recent) revision.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5589
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5590
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5591
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5592
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5593
     If filename is nil, the symbolicName for a whole package is set"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5594
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5595
    self setSymbolicName:symbolicName revision:rev overWrite:overWriteBool pathes:(Array with:pathInRepository)
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5596
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5597
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5598
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5599
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5600
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5601
     self setSymbolicName:'stable' revision:'1.1' overWrite:true path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5602
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5603
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5604
    "Modified: / 12-09-2006 / 12:37:20 / cg"
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5605
    "Modified (format): / 05-12-2017 / 22:56:04 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5606
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5607
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5608
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5609
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5610
     If rev is nil, set it for the head (most recent) revision.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5611
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5612
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5613
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5614
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5615
     If filename is nil, the symbolicName for a whole package is set.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5616
     If multiple paths are given, the revision MUST be nil."
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5617
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5618
    self setSymbolicName:symbolicNameArg asBranch:false revision:rev overWrite:overWriteBool pathes:pathsInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5619
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5620
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5621
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5622
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5623
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5624
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5625
        setSymbolicName:'test1'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5626
        revision:nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5627
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5628
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5629
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5630
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5631
        setSymbolicName:'test2'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5632
        revision:nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5633
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5634
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5635
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5636
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5637
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5638
        setSymbolicName:'test2'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5639
        revision:0
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5640
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5641
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5642
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5643
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5644
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5645
    "Created: / 12-09-2006 / 12:36:44 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5646
    "Modified: / 04-12-2017 / 18:52:43 / cg"
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5647
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5648
3931
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5649
standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5650
    "utility function: return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5651
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5652
    ^ 'Header: %1/%2/%3,v %4, %5 %6 %7 Exp'
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5653
        bindWith:moduleDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5654
        with:packageDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5655
        with:fileName
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5656
        with:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5657
        with:(Date today printStringFormat:'%y/%m/%d')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5658
        with:(Time now printStringFormat:'%h:%m:%s')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5659
        with:(OperatingSystem getLoginName)
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5660
        
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5661
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5662
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5663
     self 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5664
        revisionStringFor:Array 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5665
        inModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5666
        directory:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5667
        container:'Array.st' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5668
        revision:'123'          
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5669
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5670
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5671
    "Created: / 23-07-2012 / 18:46:29 / cg"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5672
!
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5673
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  5674
statusOf:clsOrNil fileName:classFileName directory:packageDirOrNil module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5675
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5676
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5677
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5678
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5679
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5680
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5681
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5682
     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
  5683
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5685
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5686
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5687
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  5688
    packageDirOrNil isEmptyOrNil ifTrue:[
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5689
        modulePath :=  moduleDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5690
    ] ifFalse:[        
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  5691
        modulePath :=  moduleDir , '/' , packageDirOrNil. 
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5692
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5693
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5694
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5695
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5696
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5697
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5698
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5700
    [
4361
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5701
        |collectedOutput collectedError ok|
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5702
        
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5703
        collectedOutput := WriteStream on:(String new:100).
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5704
        collectedError := WriteStream on:(String new:100).
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5705
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5706
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5707
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5708
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5709
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5710
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5711
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5712
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5713
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5714
        msg := 'CVS: fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5715
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5716
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5717
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5718
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5719
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5720
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5721
4361
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5722
        ok := self 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5723
                        executeCVSCommand:('status ' , fullName)
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5724
                        module:moduleDir
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5725
                        inDirectory:tempDir
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5726
                        log:true
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5727
                        pipe:false
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5728
                        orElseOutputTo:collectedOutput errorTo:collectedError.
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5729
        ok ifTrue:[
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5730
            inStream := collectedOutput readStream.
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5731
        ].
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5732
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5733
"/        inStream := self 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5734
"/                        executeCVSCommand:('status ' , fullName) 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5735
"/                        module:moduleDir 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5736
"/                        inDirectory:tempDir 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5737
"/                        log:true 
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5738
"/                        pipe:true.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5739
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5740
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5741
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5742
            SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5743
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5744
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5745
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5746
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5747
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5748
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5749
        info := IdentityDictionary new.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5750
        [inStream atEnd not and:[(line:= inStream nextLine) notNil]] whileTrue:[
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5751
            line := line withoutSeparators.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5752
            line notEmpty ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5753
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5754
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5755
                ((line includesString:'warning')
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5756
                 and:[ (line includesString:'is not')
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5757
                 and:[ (line includesString:'pertinent') ]]) ifTrue:[
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5758
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5759
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5760
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5761
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5762
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5763
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5764
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5765
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5766
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5767
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5768
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5769
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5770
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5771
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5772
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5773
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5774
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5775
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5776
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5777
                ].
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5778
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5779
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5780
        info isEmpty ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5781
            ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5782
            SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5783
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5784
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5785
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5786
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5787
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5788
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5789
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5790
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5791
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5792
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5793
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5794
     SourceCodeManager statusOf:Tools::NewSystemBrowser fileName:'Tools__NewSystemBrowser.st' directory:'libtool' module:'stx'  
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5795
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5796
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5797
    "Modified: / 29-08-2006 / 13:18:00 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5798
    "Modified (comment): / 18-05-2018 / 13:55:10 / Stefan Vogel"
4361
779de481266f #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4356
diff changeset
  5799
    "Modified: / 04-10-2018 / 15:42:10 / Claus Gittinger"
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  5800
    "Modified (format): / 15-05-2019 / 14:07:08 / Claus Gittinger"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5801
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5802
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5803
!CVSSourceCodeManager class methodsFor:'source code utilities'!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5804
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5805
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5806
    "return info about who changed what and when.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5807
     Return nil on failure.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5808
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5809
     The returned information is a structure entry for each line
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5810
            #revision           -> version of last change
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5811
            #author             -> author 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5812
            #date               -> change date 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5813
        "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5814
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5815
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5816
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5817
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5818
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5819
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5820
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5821
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5822
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5823
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5824
        |cmd revArg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5825
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5826
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5827
        fullName :=  modulePath , '/' , classFileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5828
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5829
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5830
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5831
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5832
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5833
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5834
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5835
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5836
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5837
        msg := 'Fetching annotation log '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5838
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5839
            msg := msg , 'in ' , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5840
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5841
            msg := msg , 'of ', clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5842
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5843
        self activityNotification:msg,'...'.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5844
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5845
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5846
                        executeCVSCommand:('annotate ' , fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5847
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5848
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5849
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5850
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5851
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5852
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5853
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5854
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5855
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5856
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5857
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5858
        "/ read the commands pipe output and extract the info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5859
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5860
        info := IdentityDictionary new.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5861
        inHeaderInfo := true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5862
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5863
            line:= inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5864
            ((line ? '') startsWith:'*******') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5865
                inHeaderInfo := false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5866
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5867
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5868
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5869
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5870
        "/ continue to read the commands pipe output 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5871
        "/ and extract change info records
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5872
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5873
        [inStream atEnd] whileFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5874
            line := inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5875
Transcript showCR:line.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5876
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5877
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5878
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5879
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5880
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5881
            OsError handle:[:ex |
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5882
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5883
            ] do:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5884
                tempDir recursiveRemove
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
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5887
        self activityNotification:nil.
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
    ^ info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5890
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5891
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5892
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5893
        annotationsFor:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5894
        fileName:'Array.st' directory:'libbasic' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5895
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5896
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5897
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5898
        annotationsFor:MenuPanel 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5899
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5900
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5901
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5902
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5903
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
  5904
    "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
  5905
     list of lines, representing the diffs between two revisions.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5906
     experimental (for ownershipGraph).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5907
     Here we ask cvs to give us the diff list"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5908
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5909
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName diffDir|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5910
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5911
    clsOrNil notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5912
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5913
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5914
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5915
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5916
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5917
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5918
4297
4922c41a64d7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4294
diff changeset
  5919
    (cacheIt) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5920
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5921
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5922
        ] ifFalse:[
4369
5f1c66fe73e8 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4361
diff changeset
  5923
            diffDir := cacheDir / modulePath / '.diffs'.
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5924
            diffDir exists ifFalse:[
4414
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
  5925
                diffDir 
7bdf532163ba #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 4411
diff changeset
  5926
                    recursiveMakeDirectoryForEachCreatedDo:[:dirName| dirName accessRights:cacheDir accessRights].
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5927
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5928
            cachedFile := diffDir / (classFileName,'_',rev1,'_',rev2).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5929
            cachedFile exists ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5930
                ^ cachedFile contents
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5931
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5932
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5933
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5934
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5935
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5936
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5937
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5938
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5939
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5940
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5941
    list := [
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5942
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5943
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5944
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5945
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5946
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5947
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5948
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5949
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5950
        msg := 'CVS: Fetching diff list of '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5951
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5952
            msg := msg , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5953
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5954
            msg := msg , clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5955
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5956
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5957
        self activityNotification:msg.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5958
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5959
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5960
                        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
  5961
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5962
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5963
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5964
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5965
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5966
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5967
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5968
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5969
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5970
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5971
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5972
        "/ read the command's pipe output, skipping some administrative info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5973
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5974
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5975
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5976
        inStream contents.
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5977
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5978
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5979
        tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5980
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5981
    list := list reject:[:line | line startsWith:'\ '].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5982
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5983
    cachedFile notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5984
        cachedFile contents:list.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5985
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5986
    ^ list
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5987
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5988
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5989
     SourceCodeManager statusOf:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5990
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5991
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5992
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5993
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5994
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5995
    "Modified: / 29-08-2006 / 13:18:00 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5996
    "Modified: / 18-05-2018 / 12:50:12 / Stefan Vogel"
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5997
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5998
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5999
initialRCSRevisionStringFor:aClass in:dir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6000
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6001
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6002
    "/ do not make the string below into one string;
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6003
    "/ RCS would expand it into a wrong rev-string
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6004
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6005
    |nm oldRev idx special|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6006
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6007
    nm := fileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6008
    (nm endsWith:',v') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6009
        nm := nm copyButLast:2
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6010
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6011
    (nm endsWith:'.st') ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6012
        nm := nm , '.st'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6013
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6014
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6015
    oldRev := aClass revisionString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6016
    special := ''.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6017
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6018
    oldRev notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6019
        idx := oldRev lastIndexOf:$[.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6020
        idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6021
            idx := oldRev indexOf:$[ startingAt:idx+1.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6022
            idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6023
                special := ' ' , (oldRev copyFrom:idx).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6024
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6025
        ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6026
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6027
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6028
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6029
    ^ '$' , 'Header: ' , dir , '/' , fileName , ',v $'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6030
      , special
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6031
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6032
    "Modified: 17.9.1996 / 15:57:15 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6033
    "Created: 14.2.1997 / 20:59:28 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6034
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6035
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6036
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6037
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6038
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6039
    |cvsRoot fullName|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6040
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6041
    cvsRoot := self getCVSROOTForModule:moduleDir.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6042
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6043
    packageDir isEmptyOrNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6044
        fullName := (cvsRoot , '/' , moduleDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6045
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6046
        fullName := (cvsRoot , '/' , moduleDir , '/' , packageDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6047
    ].        
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6048
    ^ self initialRCSRevisionStringFor:aClass in:fullName container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6049
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6050
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6051
    "Created: / 23-08-2006 / 14:05:46 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6052
! !
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6053
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6054
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6055
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6056
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6057
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6058
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6059
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6060
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  6061
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6062
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'documentation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6063
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6064
copyright
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6065
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6066
 COPYRIGHT (c) 2009 by eXept Software AG
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6067
              All Rights Reserved
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6068
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6069
 This software is furnished under a license and may be used
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6070
 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
  6071
 inclusion of the above copyright notice.   This software may not
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6072
 be provided or otherwise made available to, or used by, any
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6073
 other person.  No title to or ownership of the software is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6074
 hereby transferred.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6075
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6076
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6077
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6078
documentation
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6079
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6080
    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
  6081
    This has been replaced by instances of VersionInfo and subclasses.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6082
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6083
    CVSVersionInfo adds some CVS specific data.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6084
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6085
    [author:]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6086
        cg (cg@AQUA-DUO)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6087
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6088
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6089
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6090
version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6091
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6092
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6093
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6094
version_CVS
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6095
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6096
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6097
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6098
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'instance creation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6099
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6100
fromRCSString:aString
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6101
    "{ Pragma: +optSpace }"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6102
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6103
    "I know how to parse RCS/CVS version id strings.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6104
     Return an instance filled with revision info which is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6105
     extracted from aString. This must be in RCS/CVS format."
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6106
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6107
    |words firstWord nextWord info nm s fn revString d |
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6108
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6109
    s := aString readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6110
    s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6111
    firstWord := s upToSeparator.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6112
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6113
    info := self new.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6114
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6115
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6116
    "/ supported formats:
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6117
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6118
    "/ $-Header:   pathName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6119
    "/ $-Revision: rev $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6120
    "/ $-Id:       fileName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6121
    "/
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  6122
    (firstWord = '$Header:' or:[firstWord = '§Header:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6123
        d := firstWord first.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6124
        s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6125
        nm := s throughAll:',v '.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6126
        nm := nm withoutSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6127
        info repositoryPathName:nm.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6128
        info fileName:(nm asFilename baseName copyButLast:2).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6129
        words := s upToEnd asCollectionOfWords readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6130
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6131
        words atEnd ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6132
            nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6133
            nextWord first ~= d ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6134
                info revision:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6135
                nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6136
                (nextWord notNil and:[nextWord first ~= d]) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6137
                    info date:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6138
                    info time:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6139
                    nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6140
                    (nextWord notNil and:[nextWord startsWithAnyOf:'+-']) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6141
                        info timezone:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6142
                        nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6143
                    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6144
                    info user:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6145
                    info state:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6146
                ]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6147
            ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6148
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6149
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6150
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6151
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  6152
    (firstWord = '$Revision:' or:[firstWord = '§Revision:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6153
        info revision:(s upToEnd asCollectionOfWords first).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6154
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6155
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6156
4425
f6480b98a1a2 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4422
diff changeset
  6157
    (firstWord = '$Id:' or:[firstWord = '§Id:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6158
        "/commented out by Jan Vrany, 2009/10/20
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6159
        "/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
  6160
        "/svn has no support for $ Header $ expansion. Therefore
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  6161
        "/libsvn uses $ Id: $ instead.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  6162
        "/self halt:'no longer supported'.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6163
        words := s upToEnd asCollectionOfWords readStream.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  6164
        fn := words next.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6165
        (fn endsWith:',v') ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6166
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6167
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6168
        ].
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  6169
        info fileName:(fn copyButLast:2).
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6170
        info revision:(revString := words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6171
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6172
        "/ 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
  6173
        ((revString conform:[:c | c isDigit or:[c == $.]])
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6174
        and:[revString includes:$.]) ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6175
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6176
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6177
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6178
        info date:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6179
        info time:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6180
        info user:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6181
        info state:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6182
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6183
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6184
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6185
    ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6186
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6187
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6188
     CVSVersionInfo fromRCSString:('$' , 'Revision: 1.122 $')
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6189
     CVSVersionInfo fromRCSString:(CVSSourceCodeManager version)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6190
     CVSVersionInfo fromRCSString:(SVNSourceCodeManager version_CVS)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6191
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6192
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6193
    "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
  6194
    "Modified: / 22-11-2011 / 16:15:49 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6195
    "Modified (format): / 24-11-2011 / 10:56:51 / cg"
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  6196
    "Modified (format): / 07-03-2017 / 22:25:54 / mawalch"
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6197
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6198
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6199
!CVSSourceCodeManager::CVSVersionInfo methodsFor:'accessing'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6200
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6201
changedLinesInfo
4422
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  6202
    ^ changedLinesInfo ? ''
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  6203
ada6bcb9edc5 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4419
diff changeset
  6204
    "Modified: / 12-05-2019 / 13:03:41 / Claus Gittinger"
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6205
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6206
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6207
changedLinesInfo:aString
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6208
    changedLinesInfo := aString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6209
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6210
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6211
repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6212
    ^ repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6213
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6214
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6215
repositoryPathName:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6216
    repositoryPathName := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6217
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6218
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6219
timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6220
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6221
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6222
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6223
timeZone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6224
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6225
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6226
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6227
timezone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6228
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6229
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6230
    "Created: / 22-10-2008 / 20:50:39 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6231
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6232
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6233
timezone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6234
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6235
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6236
    "Created: / 22-10-2008 / 20:50:32 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6237
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6238
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6239
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6240
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  6241
version
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  6242
    ^ '$Header$'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6243
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6244
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6245
version_CVS
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  6246
    ^ '$Header$'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6247
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  6248
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  6249
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  6250
CVSSourceCodeManager initialize!