CVSSourceCodeManager.st
author Claus Gittinger <cg@exept.de>
Fri, 25 May 2018 16:14:36 +0200
changeset 4326 8d1d982eb90b
parent 4322 e01f3898946f
child 4327 f756bc4c48c4
permissions -rw-r--r--
#BUGFIX by cg class: HTMLDocGenerator changed: #printOutHTMLMethodProtocol:on:showClassName:classRef:picturePath: care for long running comment extraction
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
     1
"{ Encoding: utf8 }"
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
     2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
 COPYRIGHT (c) 1995 by Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     5
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    14
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    15
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    16
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    17
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    18
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    19
	instanceVariableNames:''
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    20
	classVariableNames:'AuthorMap CMD_checkout CVSBranchPerPackage CVSCommandSemaphore
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    21
		CVSCommandTimeout CVSCommitOptions CVSExecutable CVSModuleRoots
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
    22
		CVSRoot CVSTempDir CVSUpdateOptions DisabledModules RecentTags
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    23
		RecentlyCheckedModulesAndPackages RemoteCVS'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    24
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    25
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    26
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    27
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    28
VersionInfo subclass:#CVSVersionInfo
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
    29
	instanceVariableNames:'repositoryPathName timeZone changedLinesInfo'
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    30
	classVariableNames:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    31
	poolDictionaries:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    32
	privateIn:CVSSourceCodeManager
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    33
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    34
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    35
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    36
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    37
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    38
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    40
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    41
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    42
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    43
 only in accordance with the terms of that license and with the
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    44
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    45
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    46
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    47
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    48
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    variable being set by a private.rc file).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    57
    Under that top, for each module (especially the stx module itself),
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
    60
    If not specified otherwise, the module defaults to 'stx'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
        (foo/bar/x)                     - module defaults to 'stx'; dir is 'foo/bar/x'; library name defaults to x
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
    to use the last format (by changing the Make.proto files and add a -P flag to
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    85
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    88
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    89
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    90
        - Make certain that either no local source directory exists, or it is empty or it contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    91
          only source code for files NOT found in the repository (this will not be required in future versions).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    94
        currently, the rcs container is accessed directly, since cvs mangles the file's ident-string and
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
        thus does not correctly recreate the original file (all source is offset by some characters w.r.t. the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    96
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    97
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    98
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    99
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
   100
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   105
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
                                        if false, disk access is used;
3948
mawalch
parents: 3931
diff changeset
   113
                                        files in CVSRoot must be accessible.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
4298
736e531022ff #DOCUMENTATION by mawalch
mawalch
parents: 4297
diff changeset
   164
        should accomplish this.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
        from the eXept cvs server (i.e. CVSROOT for them is :pserver:userName@exept.de:/files/CVS/stc).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   191
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   192
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   193
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   194
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   195
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   199
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   200
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   201
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   202
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   203
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   204
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   205
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   206
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   207
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   208
exeptsPrivateSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   209
    "the actual stx repository as used within exept.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   210
     Only valid within exept"
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   211
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   212
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   213
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   214
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   215
exeptsPublicSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   216
    "the public repository, which is a read-only copy of the exept-internal repository.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   217
     Updated every night."
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   218
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   219
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   220
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   221
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   222
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   223
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   227
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   228
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   229
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   230
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
4047
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   237
    | s f top |
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   238
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   239
    CVSCommandSemaphore isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   240
        CVSCommandSemaphore := (Semaphore new:10) name:'Concurrent CVS Commands'.    "/ at most 10 cvs activities concurrently
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   241
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   242
    CVSCommitOptions isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   243
        CVSCommitOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   244
        CVSUpdateOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   245
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   246
    RemoteCVS isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   247
        RemoteCVS := true.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   248
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   250
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   251
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   252
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   253
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   254
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   256
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   259
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   260
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   261
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   262
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   263
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   264
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
    "/
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   272
    ((f := CVSRoot asFilename) isDirectory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   278
    DefaultManager isNil ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   279
        DefaultManager := self.
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   280
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   283
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   284
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
    "/ and updated/commited files are not removed.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   292
    "/ If you use a regular (make-) tree,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   314
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   315
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   316
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   317
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   318
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   319
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   320
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   321
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   322
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   323
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
    "set the global CVSROOT directory (i.e. the repositories name).
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   328
     And reinitialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
    AbstractSourceCodeManager initialize.
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   333
    self initialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   334
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   335
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   336
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   338
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   339
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   340
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   341
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   342
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   343
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   344
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   345
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   346
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   347
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   348
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   349
    ((OperatingSystem getDomainName endsWith:'exept.de') or:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   350
     OperatingSystem getNetworkAddresses contains:[:eachSocketAddress| eachSocketAddress hostAddress startsWith: #[172 23 1]]]
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   351
    ) ifTrue:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   352
        self addExeptsPrivateRepositoryToModuleRoots.
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   353
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   354
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   355
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   356
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   357
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   358
CVSBranchPerPackage
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   359
    ^ CVSBranchPerPackage
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   360
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   361
    "Created: / 04-12-2017 / 17:30:34 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   362
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
   363
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   364
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   365
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   366
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   367
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   368
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   369
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   370
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   371
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   372
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   373
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   374
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   375
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   376
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   377
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   378
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   379
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   380
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   381
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   382
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   383
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   384
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   385
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   386
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   387
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   388
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   389
    "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
   390
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   391
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   392
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   393
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   394
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   395
    "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
   396
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   397
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   398
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   399
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   400
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   401
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   402
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   403
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   404
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   405
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   406
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   407
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   408
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   409
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   410
        CVSExecutable := nil
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
   411
    ] ifFalse:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   412
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   413
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   414
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   415
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   416
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   417
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   418
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   419
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   420
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   421
     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
   422
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   423
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   424
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   425
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   426
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   427
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   428
    d exists ifFalse:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   429
        d recursiveMakeDirectory.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   430
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   431
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   432
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   433
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   434
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   435
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   436
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   437
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   438
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   439
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   440
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   441
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   442
     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
   443
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   444
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   445
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   446
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   447
    "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   448
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   449
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   450
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   451
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   452
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   453
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   454
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   455
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   456
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   457
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   458
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   459
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   460
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   461
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   462
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   463
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   464
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   465
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   466
    "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
   467
3848
2768cbd5b7f1 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3834
diff changeset
   468
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   469
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   470
    "
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   471
     self recentTag
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   472
    "
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   473
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   474
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   475
recentTag:aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   476
    "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
   477
4102
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   478
    aString isEmpty ifTrue:[
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   479
        ^ self.
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   480
    ].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   481
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   482
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   483
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   484
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   485
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   486
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   487
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   488
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   489
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   490
    "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
   491
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   492
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   493
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   494
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   495
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   496
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   497
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   498
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   499
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   500
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   501
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   502
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   503
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   504
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   505
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   506
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   507
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   508
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   509
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   510
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   511
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   512
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   513
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   514
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   515
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   516
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   517
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   518
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   519
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   520
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   521
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   522
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   523
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   525
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   528
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   531
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   533
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   539
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   540
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   541
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
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:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   546
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
     If left unspecified, the global (i.e. fallBack) repository is used."
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
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   561
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   562
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   563
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   564
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   565
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   566
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   567
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   568
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   569
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   570
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   571
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   572
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   573
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   574
    "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
   575
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   576
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   577
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   578
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   579
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   584
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   585
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   586
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   588
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   589
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   590
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   591
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   594
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   596
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   597
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   598
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   599
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   600
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   601
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   602
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   603
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   604
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   605
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   606
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   607
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   608
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   609
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   610
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   611
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   612
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   613
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   614
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   615
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   616
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   617
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   618
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   619
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   620
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   621
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   622
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   623
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   624
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   625
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   626
     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
   627
     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
   628
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   629
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   630
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   631
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   632
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   633
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   634
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   635
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   636
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   637
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   638
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   639
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   640
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   641
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   642
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   643
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   644
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   645
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   646
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   647
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   648
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   649
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   650
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   651
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   652
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   653
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   654
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   671
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
    "Modified: 12.9.1996 / 02:39: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 option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   756
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   759
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   767
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   768
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   771
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   772
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   775
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   776
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   777
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   778
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   779
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   782
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   783
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   786
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   787
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   790
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   791
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   792
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   796
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   803
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   810
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   811
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   813
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   814
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
        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
   819
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   821
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   822
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   823
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   828
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
     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
   830
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   834
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   835
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   836
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   837
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   838
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   839
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   840
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   841
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   842
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   843
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   844
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   845
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   846
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   847
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   848
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   852
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   853
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   854
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   855
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   856
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   857
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   859
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   860
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   861
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   862
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   863
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   864
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   865
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   866
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   867
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   868
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   869
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   870
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   871
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   872
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   873
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   874
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   875
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   876
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   877
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   878
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   879
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   880
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   881
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   882
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   883
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   884
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   885
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   886
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   887
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   888
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   889
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   890
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   891
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   892
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   893
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   895
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   897
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   899
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   901
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   905
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   906
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   909
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   911
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   912
                defaultContents notNil ifTrue:[
3949
0514468a25e4 #BUGFIX
mawalch
parents: 3948
diff changeset
   913
                    s nextPutAll:defaultContents.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   914
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   916
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   943
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   945
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   951
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   955
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   956
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   957
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   961
    "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
   962
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   963
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   966
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   967
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   969
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   972
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   973
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   974
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   976
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   978
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   979
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   982
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   984
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   987
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
    "Modified: / 20.5.1998 / 16:07:28 / cg"
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
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1001
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
     if dir ~= nil, execute command in that directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1003
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1005
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1006
    ^ self
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1007
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1008
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1009
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1010
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1011
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
  1012
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1013
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1014
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1015
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1016
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1017
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1018
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1019
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1020
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1021
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
  1022
    "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
  1023
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1024
     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
  1025
     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
  1026
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1027
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1028
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1029
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1030
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1031
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1032
        pipe:false
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1033
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1034
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1035
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1036
    "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
  1037
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1038
    "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
  1039
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1040
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1041
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1042
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1043
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1044
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1045
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1046
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1047
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1048
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1049
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1050
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1051
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1052
        pipe:doPipe
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1053
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1054
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1055
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1056
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1057
    "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
  1058
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1059
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1060
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1061
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1062
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
  1063
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1064
     execute command in the dirArg directory (or the current directory if dirArg is nil).
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1065
     The doLog argument, if false suppresses a logEntry to be added
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1066
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1067
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1068
    |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
  1069
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1070
    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
  1071
        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
  1072
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1073
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1074
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1075
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1076
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1077
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1078
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1079
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1080
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1081
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1082
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1083
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1084
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1085
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1086
    "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
  1087
    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
  1088
        (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
  1089
            (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
  1090
                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
  1091
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1092
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1093
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1094
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1095
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1096
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1097
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1098
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1099
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1100
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1101
    doPipe ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1102
        rslt := PipeStream
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1103
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1104
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1105
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1106
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1107
    ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1108
        osProcess := OSProcess new
4297
4922c41a64d7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4294
diff changeset
  1109
                        command:command directory:pathOfDir;
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1110
                        outStream:outStreamOrNil;
4297
4922c41a64d7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4294
diff changeset
  1111
                        errorStream:errorStreamOrNil.
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1112
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1113
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1114
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1115
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1116
            "/ 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
  1117
            ok := rslt := osProcess execute.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1118
        ] ifTrue:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1119
            CVSCommandSemaphore critical:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1120
                |errOut done|
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1121
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1122
                errOut := WriteStream on:''.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1123
                osProcess errorStream:errOut.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1124
                ok := osProcess startProcess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1125
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1126
                [
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1127
                    done := true.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1128
                    (osProcess waitUntilFinishedWithTimeout:self cvsCommandTimeout) isNil ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1129
                        (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
  1130
                                                bindWith:self cvsCommandTimeout with:command)) 
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1131
                        ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1132
                            done := false
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1133
                        ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1134
                            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1135
                            osProcess terminate.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1136
                            ok := false.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1137
                            errorString := 'CVS command timeout'.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1138
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1139
                    ] ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1140
                        ok := rslt := osProcess finishedWithSuccess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1141
                        ok ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1142
                            errorString := errOut contents.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1143
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1144
                    ]
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1145
                ] doUntil:[done].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1146
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1147
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1148
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1149
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1150
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1151
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1152
            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
  1153
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1154
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1155
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1156
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1157
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1158
    "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
  1159
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1160
    "Created: / 28-02-2012 / 17:30:34 / cg"
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1161
    "Modified: / 06-12-2017 / 03:22:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1163
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1164
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1165
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1166
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1167
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1168
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1169
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1170
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1171
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1172
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1173
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1174
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1175
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1176
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1177
                s notNil ifTrue:[
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1178
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1179
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1180
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1181
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1184
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1189
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1191
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1192
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1193
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1194
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1195
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1196
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
                    fileName := revisionUsed := nil.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1198
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1199
            ].
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1202
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1203
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1208
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1209
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1210
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1211
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1212
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1213
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1214
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1215
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1216
            line notEmpty ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1217
                s := line restAfter:'RCS file:' withoutSeparators:true.
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1218
                s notNil ifTrue:[
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1219
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1220
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1221
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1222
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1223
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1224
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1225
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1226
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1230
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1235
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1236
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1239
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
                    fileName := revisionUsed := nil.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1241
                ].
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  1242
            ].
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1243
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1244
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1245
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1246
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1247
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1248
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1249
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1250
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1251
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1252
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1253
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1254
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1255
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1256
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1257
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1258
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1259
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1260
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1261
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1262
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1274
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1278
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1281
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1296
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1297
    "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
  1298
     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
  1299
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1300
     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
  1301
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1302
              #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
  1303
              #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
  1304
              #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
  1305
              #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
  1306
              #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
  1307
              #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
  1308
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1309
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1310
    |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
  1311
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1312
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1313
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1314
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1315
    [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
  1316
        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
  1317
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1318
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1319
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1320
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1321
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1322
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1323
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1324
        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
  1325
        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
  1326
        "/ decompose date/author/state etc.
4256
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1327
        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
  1328
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1329
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1330
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1331
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1332
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1333
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1334
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1335
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1336
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1337
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1338
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1339
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1340
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1341
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1342
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1343
        "first revision does not have a 'lines:' entry"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1344
        (record at:#numberOfChangedLines ifAbsent:[nil]) isNil ifTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1345
            record at:#numberOfChangedLines put:''
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1346
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1348
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1349
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1350
        [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
  1351
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1352
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1353
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1354
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1355
                    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
  1356
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1357
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1358
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1359
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1360
                    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
  1361
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1362
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1363
            ]
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
        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
  1366
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1367
    ^record.
4256
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1368
521560be3433 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4239
diff changeset
  1369
    "Modified: / 20-09-2017 / 20:16:45 / stefan"
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
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1372
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1373
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1374
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1375
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1376
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1377
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1378
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1379
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1380
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1381
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1382
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
    "/
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
  1390
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1408
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1420
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1421
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1422
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1425
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1426
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1429
repositoryTopDirectoryFromSCMRoot
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1430
    "return the top of the repository. This handles remote CVS connections
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1431
     as well"
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1432
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1433
    CVSRoot isNil ifTrue:[^ nil].
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1434
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1435
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1436
    "
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1437
     CVSSourceCodeManager repositoryTopDirectory
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1438
    "
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1439
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1440
    "Created: / 18-05-2018 / 12:30:05 / Stefan Vogel"
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1441
!
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1442
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1452
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1473
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1474
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1475
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1476
     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
  1477
     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
  1478
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1479
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1480
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1481
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1482
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1483
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1484
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1485
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1486
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1487
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1488
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1489
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1490
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1491
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1492
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1493
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1494
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1495
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1496
             "/ already a modified class
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1497
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1498
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1500
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1503
    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1504
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1506
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1507
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1513
    "/ 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
  1514
    "/      '$ 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
  1515
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1516
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1517
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1518
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1520
    "/      'Exp $'
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1521
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'.
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1522
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart
4233
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1523
277b4ea21e4c #DOCUMENTATION by mawalch
mawalch
parents: 4232
diff changeset
  1524
    "Modified (comment): / 13-04-2017 / 19:29:22 / mawalch"
3649
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
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1527
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1528
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1529
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1530
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1531
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1532
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1533
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1534
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1535
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1536
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1539
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1540
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1542
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1544
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1549
             "/ already a modified class
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1555
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1560
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1561
    "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
  1562
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1563
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1564
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1565
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1566
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1567
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1568
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1570
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1571
2449
vrany
parents: 2403
diff changeset
  1572
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1573
vrany
parents: 2403
diff changeset
  1574
    "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
  1575
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1576
vrany
parents: 2403
diff changeset
  1577
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1578
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1579
vrany
parents: 2403
diff changeset
  1580
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1581
!
vrany
parents: 2403
diff changeset
  1582
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1583
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1584
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1585
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1586
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1587
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1588
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1589
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1590
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1591
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1592
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1593
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1594
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1595
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1596
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1597
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1598
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1599
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1600
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1601
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1602
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1603
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1604
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1605
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1606
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1607
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1608
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1609
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1610
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1611
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1612
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1613
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1614
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1615
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1616
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1617
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1618
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1619
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1620
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1621
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1622
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1623
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1624
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1625
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1626
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1627
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1628
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1629
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1630
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1631
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1632
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1633
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1634
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1635
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force onBranch:branchNameOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1636
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1637
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1638
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1639
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1640
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1641
    |tempdir cmd checkoutName logMsg revision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1642
     cmdOut whatHappened idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1643
     newRevision  msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1644
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1645
     editor checkInRepaired didAccept emphasizedText repairedText out
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1646
     emSep comment branchTag|
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1647
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1648
    branchNameOrNil notNil ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1649
        branchTag := (self branchTagPrefix,branchNameOrNil).
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1650
        revision := self utilities
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1651
                        revisionForSymbolicName:branchTag
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1652
                        class:nil
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1653
                        fileName:containerFilename
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1654
                        directory:packageDir
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1655
                        module:moduleDir
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1656
                        manager:self.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1657
    ] ifFalse:[    
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1658
        revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1659
    ].
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1660
    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1661
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1662
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1666
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1667
        modulePath := moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1668
    ] ifFalse:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1669
        modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1670
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1671
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1672
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1674
        "/ a new file ...
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1675
        ^ self createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1676
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1677
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1678
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1679
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1681
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1682
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1683
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1684
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1685
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1686
        "/ 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
  1687
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1688
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1689
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1690
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1691
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1692
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1693
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1694
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1695
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1696
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1697
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1698
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1699
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1700
        "/ 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
  1701
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1702
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
        "/ 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
  1704
        time := UtcTimestamp now subtractSeconds:1.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1705
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1706
        self createEntryFor:checkoutName
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1708
             in:(tempdir construct:modulePath)
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1709
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
             overwrite:true.
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
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1715
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1716
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1717
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1718
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' 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
        ] do:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1721
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1722
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1723
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1724
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1725
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1726
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1727
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1728
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1729
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1730
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  1731
        self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1732
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1733
        branchTag notNil ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1734
            cmd := 'update ', CVSUpdateOptions, ' -r ', branchTag, ' ' , containerFilename, ' >', '"' , cmdOut name , '"'.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1735
        ] ifFalse:[    
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1736
            cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  1737
        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1738
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1739
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1744
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1749
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1750
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1751
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1752
            "/   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
  1753
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1754
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1755
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1756
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1758
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1759
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1761
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1762
            "/ no change
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1768
            ^ true
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1771
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1772
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1773
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1775
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1776
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1777
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1779
                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
  1780
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1781
            changeLog notNil ifTrue:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1782
                |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1783
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1784
                s := CharacterWriteStream new.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1786
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1788
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1791
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1792
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1795
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1796
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1797
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1798
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1799
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1800
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1801
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1802
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1803
                            and:[(line startsWith:'Merging') not
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1804
                            and:[line notEmpty]]]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1805
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1806
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1807
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1808
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1809
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1810
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1811
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1812
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1813
            or:[changeLog isNil
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1814
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
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
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1817
                "/
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1818
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1819
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1821
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1822
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1823
                "/ 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
  1824
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1826
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1827
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1828
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1829
                mySource := someText.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1830
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1831
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1832
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1833
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1834
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1835
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1836
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1838
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1839
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1840
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1841
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1842
                                   abortable:false
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1843
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1844
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1845
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1846
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1848
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1849
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1850
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1851
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
  1852
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1853
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1854
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1855
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1856
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1860
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1861
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1862
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1863
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1865
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1866
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1867
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1868
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1869
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1870
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1871
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1872
                                label:'merged version'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1873
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1874
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1875
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1876
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1884
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1886
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1887
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1888
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1889
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1894
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1895
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1896
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1897
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1898
"/                ].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1899
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1900
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1901
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1902
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1903
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1904
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1905
                "/ 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
  1906
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1907
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1908
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1909
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1910
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1914
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1915
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1916
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1917
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1918
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1919
                     message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1920
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1921
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1922
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
                answer == #option 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
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1928
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1929
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1930
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1931
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1932
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1933
                        label:'newest repository version'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1935
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1936
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1937
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1938
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1939
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1940
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1942
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1943
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
                    "/ ... accept will check it in.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1945
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1946
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1947
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1949
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1950
                                emphasizeMergedDiff3Text:emphasizedText
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1953
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1954
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1955
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1956
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1957
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1958
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1959
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1960
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1961
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1963
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1964
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1965
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1966
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1967
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1968
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1969
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1971
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1972
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1973
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1974
                        editor := RCSConflictEditTextView
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1976
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1977
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1980
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1981
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1982
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1983
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1984
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1985
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1986
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1987
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1988
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1989
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1990
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1991
                            "/ check if all green-stuff (separators) have been removed
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  1992
                            (repairedText contains:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1993
                                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
  1994
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1995
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1996
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1997
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1998
                    ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1999
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2000
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2001
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2002
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2003
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2004
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2005
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2006
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2007
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2008
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2009
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2010
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2011
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2012
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2013
                checkInRepaired ifTrue:[
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2014
                    Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2015
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2016
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2017
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2019
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2020
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2021
                (whatHappened startsWith:'U ') ifTrue:[
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
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2024
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2025
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2026
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2027
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2028
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2029
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2030
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2031
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2032
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2033
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2034
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2037
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2038
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2039
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2040
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2041
            ]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2042
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2043
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2044
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2045
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2046
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2047
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2048
        self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
3264
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
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2051
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2052
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
            "/ save the log message into another tempFile ...
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2054
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2055
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2057
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2058
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2059
            s close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2060
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2064
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2066
        ] ifTrue:[
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
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2069
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2070
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2071
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2072
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2073
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2075
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2076
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2077
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2078
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2079
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2080
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2081
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2082
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2083
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2084
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2085
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2086
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2087
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2088
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2089
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2090
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2091
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2092
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2093
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2096
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2099
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2100
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2101
            whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2102
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2104
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2105
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2106
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2107
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2108
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2109
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2110
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2111
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2112
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2113
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2114
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2115
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2116
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2117
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2118
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2119
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2120
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2121
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2122
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2123
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2124
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2125
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2126
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2127
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  2128
    "Created: / 05-12-2017 / 23:28:31 / cg"
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  2129
    "Modified: / 06-12-2017 / 03:19:59 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  2130
    "Modified: / 09-05-2018 / 19:31:44 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2131
    "Modified: / 18-05-2018 / 13:43:44 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
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
  2135
    ^ 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
  2136
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2137
    "Created: / 11-09-1996 / 16:16:11 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2138
    "Modified: / 31-07-2013 / 18:07:53 / cg"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2139
    "Modified: / 29-03-2017 / 18:21:23 / stefan"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2140
!
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2141
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2142
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
  2143
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2145
     instead, the code is checked in as given (Dangerous).
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2146
     Return true if ok, false if not.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2147
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2148
     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
  2149
     (branch support does not work yet!!)"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2150
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2151
    |tempdir cmd checkoutName logMsg classRevision newestRevision cmdOut whatHappened s entry idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
     newRevision newString binRevision className msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2153
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2154
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2155
     emSep force conflictResolvedManually revisionOption|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2160
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2161
        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
  2162
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2163
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2164
    classRevision := cls revisionOfManager:self.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2165
    (classRevision notNil and:[classRevision endsWith:$m]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2166
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2167
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2168
        "/ must use the original revision string.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2169
        classRevision := classRevision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2170
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2171
    binRevision := cls binaryRevision.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2172
    (binRevision notNil and:[classRevision ~= binRevision]) ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2173
        Transcript showCR:('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (classRevision ? '?'))
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2174
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2175
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2176
    classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2177
        "there is no version method. Get the version from the repository"
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2178
        classRevision := newestRevision := self newestRevisionOf:cls.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2179
        classRevision isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
            force ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2181
                classRevision := newestRevision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2182
            ].
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2183
            classRevision isNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2184
                classRevision := '1.0'   "/ initial checkin
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2185
            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2186
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2187
            classRevision == #deleted ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2188
                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
  2189
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2190
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2193
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2194
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2195
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2196
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2197
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2198
            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
  2199
            ^ false.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2200
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2201
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2202
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2203
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2204
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2205
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2206
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2207
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2208
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2209
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2210
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2211
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2212
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2213
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2214
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2215
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2216
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2217
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2218
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2219
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2220
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2221
    ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2222
    [ "ensure protected block"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2223
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2224
        "/ 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
  2225
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2226
        packageDir isEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2227
            modulePath := moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2228
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2229
            modulePath :=  moduleDir , '/' , packageDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2230
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2231
        checkoutName :=  modulePath , '/' , classFileName.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2232
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2233
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2234
        "/ 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
  2235
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2236
        time := UtcTimestamp now subtractSeconds:1.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2237
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2238
        self createEntryFor:checkoutName
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2239
             module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2240
             in:(tempdir construct:modulePath)
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2241
             revision:classRevision
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2242
             date:(self cvsTimeString:time)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2243
             special:''
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2244
             overwrite:true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2245
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2246
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2247
        "/ copy-over our current version
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
        Error handle:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2250
            self reportError:'cannot copy-over filedOut class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2251
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2252
        ] do:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2253
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2254
        ].
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
        "/ synchronize i.e. merge in any changes
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
        self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
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
        revisionOption := ''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2262
        branchTag notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2263
            revisionOption := '-r ', branchTag.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2264
        ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2265
            (classRevision occurrencesOf:$.) > 2 ifTrue:[
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2266
                "must be a branch, compare with branch revision"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2267
                revisionOption := '-r ', classRevision copyUpToLast:$..
4229
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2271
        cmd := 'update %1 %4 %2 >"%3"'
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2272
                    bindWith:CVSUpdateOptions
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2273
                    with:classFileName
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2274
                    with:cmdOut name
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2275
                    with:revisionOption.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2276
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2277
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2278
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2279
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2280
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2281
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2282
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2283
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2284
                    "/ no container
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2285
                    "/ someone fiddled around with repository ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2286
                    (cls binaryRevision notNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2287
                        (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
  2288
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2289
                            cls setBinaryRevision:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2290
                            ^ 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
  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
                    (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
  2294
                    ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2295
                        ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2296
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2297
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2298
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2299
                "/ is the version correct ?
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2300
                newestRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2301
                    newestRevision := self newestRevisionOf:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2302
                    newestRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2303
                        (Dialog confirm:('The source container for ',cls name allBold,' seems corrupted. Proceed?' withCRs)) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2304
                            ^ false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2305
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2306
                        ^ self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2307
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2308
                            source:sourceFileName logMessage:logMessage force:true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2309
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2310
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2311
"/            revision > newestRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2312
"/                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
  2313
"/                ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2314
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2315
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2316
"/                    ^ 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
  2317
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2318
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2319
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2320
"/            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
  2321
"/            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2322
                "/ if we arrive here, proceed as if merged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2323
                whatHappened := 'M initial'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2324
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2325
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2326
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2327
            "/ check what happened - the contents of the cmdOut file may be:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2328
            "/   empty   -> nothing changed
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2329
            "/   M xxx   -> merged-in changes from other users
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2330
            "/   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
  2331
            "/              needs special action
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
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2334
                whatHappened := cmdOut contentsAsString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2335
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2336
                self breakPoint:#cg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2337
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2338
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2339
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2340
        (whatHappened isEmptyOrNil) ifTrue:[
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
            "/ no change
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2343
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2344
            Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2345
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2346
            force ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2347
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2348
"/                (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
  2349
"/                    ChangeSet current condenseChangesForClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2350
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2351
"/            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2352
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2353
"/            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2354
                self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2355
            ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2356
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2357
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2358
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2359
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2360
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2361
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2362
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2363
                    newString isEmptyOrNil ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2364
                        'CVSSourceCodeManager [error]: missing revisionString' errorPrintCR
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2365
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2366
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2367
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2368
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2369
                        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2370
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2371
                        ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2372
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2373
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2374
            ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2375
            ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2376
        ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2377
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2378
        Verbose == true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2379
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2380
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2381
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2382
        force ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2383
            |nextRevision|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2384
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2385
            classRevision notNil ifTrue:[
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2386
                nextRevision := self revisionAfter:classRevision.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2387
            ].
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2388
            changeLog := self revisionLogOf:cls fromRevision:nextRevision toRevision:nil.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2389
            changeLog notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2390
                s := CharacterWriteStream on:''.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2391
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2392
                changesAsLogged := s contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2393
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2394
                "/ mhmh - that should not happen
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2395
                changesAsLogged := ''.
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2399
        didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2400
        conflictResolvedManually := checkInRepaired := checkInNew := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2401
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2402
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2403
        "/ cvs above rel10 returns a multiline info ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2404
        "/ we have to extract the one line which states what happened.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2405
        "/
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2406
        whatHappened := whatHappened asCollectionOfLines reject:[:line |
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2407
                            line isEmpty
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2408
                            or:[(line startsWith:'RCS file')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2409
                            or:[(line startsWith:'retrieving')
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2410
                            or:[(line startsWith:'Merging')]]]
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2411
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2412
        whatHappened := whatHappened asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2413
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2414
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2415
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2416
            "/ merged in changes / resurrected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2417
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2418
            (force
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2419
             or:[changeLog isNil
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2420
             or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
4229
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
                "/ pretty good - nothing has changed in the meanwhile
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2423
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2424
                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
  2425
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2426
                |mySource mergedSource |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2427
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2428
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2429
                "/ 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
  2430
                "/ and version have been merged.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2431
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2432
                didMerge := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2433
                changesAsLogged := changesAsLogged asCollectionOfLines.
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
                s := CharacterWriteStream new.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2436
                self fileOutSourceCodeOf:cls on:s.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2437
                mySource := s contents.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2438
                mergedSource := (tempdir construct:checkoutName) readStream contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2439
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2440
                mySource = mergedSource ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2441
                    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
  2442
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2443
I have merged your version with the newest repository version,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2444
and found no differences between the result and your current version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2445
(i.e. your version seemed up-to-date).'.
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
                    self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2448
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2449
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2450
                                   abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2451
                                   option:nil.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2452
                    didMerge := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2453
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2454
                    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
  2455
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2456
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
  2457
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
  2458
into a new common revision which may be different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2459
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
  2460
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2461
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
  2462
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
  2463
change methods as required and check in again.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2464
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
  2465
and you should update your class from the repository.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2466
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2467
Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2468
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2469
                    answer := self checkinTroubleDialog:'Merging versions'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2470
                                   message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2471
                                   log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2472
                                   abortable:true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2473
                                   option:'Stop - see first'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2474
                                   option2:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2475
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2476
                    answer == #option2 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2477
                        (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
  2478
                        ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2479
                            s := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2480
                            self fileOutSourceCodeOf: cls on:s.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2481
                            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2482
                            answer := true.
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
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2485
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2486
                    answer ~~ true ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2487
                        answer == #option ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2488
                            DiffCodeView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2489
                                openOn:mySource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2490
                                label:'current version'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2491
                                and:mergedSource
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2492
                                label:'merged version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2493
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2494
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2495
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2496
                        ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2497
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2498
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2499
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2500
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2501
"/                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
  2502
"/' , changesAsLogged , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2503
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2504
"/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
  2505
"/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
  2506
"/into a new common revision which is different from both.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2507
"/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
  2508
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2509
"/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
  2510
"/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
  2511
"/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
  2512
"/is different from your current classes.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2513
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2514
"/Continue ?'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2515
"/                (self confirm:msg) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2516
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2517
"/                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2518
"/                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2519
                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
  2520
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2521
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2522
            (whatHappened startsWith:'C ') ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2523
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2524
                "/ conflict; someone else checked in something in the meanwhile,
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2525
                "/ 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
  2526
                "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2527
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2528
                changesAsLogged := changesAsLogged asCollectionOfLines.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2529
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2530
                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
  2531
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2532
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
  2533
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2534
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
  2535
and change your methods avoiding conflicts. Then checkin again.
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2538
                answer := self checkinTroubleDialog:'Version conflict'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2539
                     message:msg
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2540
                     log:changesAsLogged
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2541
                     abortable:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2542
                     option:'Show conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2543
                     option2:'Resolve conflicts'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2544
                     option3:'Do NOT Merge - Force my Code'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2545
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2546
                answer == #option ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2547
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2548
                    "/ show conflicts in a 3-way DiffTextView ...
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
                    Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2551
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2552
                        label:'your version (checkin attempt)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2553
                        label:'original (base version)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2554
                        label:'newest repository version'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2555
                ].
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
                answer == #option2 ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2558
                    |diffComment|
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2559
4229
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
                    "/ allow checkin of repair version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2562
                    "/ this is error prone ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2563
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2564
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2565
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2566
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2567
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2568
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2569
                    emSep := (Array with:(#color->Color black)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2570
                                 with:(#backgroundColor->Color green)).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2571
                    emphasizedText := Diff3TextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2572
                                emphasizeMergedDiff3Text:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2573
                                emphasize1:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2574
                                                  with:(#backgroundColor->Color blue))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2575
                                emphasize2:(Array with:(#color->Color white)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2576
                                                  with:(#backgroundColor->Color red))
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2577
                                emphasizeSep:emSep.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2578
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2579
                    diffComment :=
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2580
'"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2581
"/ This text contains your current versions code (blue)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2582
"/ 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
  2583
"/ from some other checkin.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2584
"/ Each such conflict is surrounded by green text (like this paragraph).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2585
"/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2586
"/ 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
  2587
"/ 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
  2588
"/ 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
  2589
"/ ***************************************************************
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2590
'.
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2591
                    diffComment := (Text string:diffComment emphasis:emSep) asStringCollection.
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2592
                    emphasizedText := diffComment , emphasizedText.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2593
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2594
                    didAccept := false. checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2595
                    [didAccept not and:[checkInRepaired]] whileTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2596
                        editor := RCSConflictEditTextView
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2597
                                    setupWith:emphasizedText
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2598
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2599
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2600
                        editor acceptAction:[:dummy |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2601
                            repairedText := editor list.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2602
                            didAccept := true.
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
                        didAccept := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2605
                        editor topView openModal.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2606
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2607
                        didAccept ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2608
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2609
                            ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2610
                                checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2611
                            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2612
                        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2613
                            "/ check if all green-stuff (separators) have been removed
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2614
                            (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
  2615
                                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
  2616
                                didAccept := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2617
                            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2618
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2619
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2620
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2621
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2622
                    checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2623
                        [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2624
                            out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2625
                            out nextPutAll:(repairedText asString string).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2626
                            didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2627
                            out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2628
                        ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2629
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2630
                            checkInRepaired := false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2631
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2632
                    ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2633
                ].
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
                answer == #option3 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2636
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2637
                    "/ force checkin of new version
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2638
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2639
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2640
                    "/ show merged version in an editor ...
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2641
                    "/ ... accept will check it in.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2642
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2643
                    [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2644
                        out := (tempdir construct:checkoutName) writeStream.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2645
                        self fileOutSourceCodeOf: cls on:out.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2646
                        out close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2647
                        didAccept := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2648
                        checkInNew := checkInRepaired := true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2649
                    ] on:FileStream openErrorSignal do:[:ex|
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2650
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2654
                checkInRepaired ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2655
                    checkInNew ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2656
                        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
  2657
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2658
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2659
                        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
  2660
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2661
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2662
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2663
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2664
                    ^ false.
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
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2667
                ((whatHappened startsWith:'U ')
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2668
                 or:[whatHappened startsWith:'P ']) ifTrue:[
4229
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
                    "/ nothing changed here, but the repository already contains
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2671
                    "/ a newer version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2672
                    "/
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
                    self information:'nothing changed in your ''' , className , ''';
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2675
but repository already contains a newer version (repository unchanged).'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2676
                    ^ true.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2677
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2678
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2679
                    "/ unexpected
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2680
                    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2681
                    self warn:'unexpected message from CVS:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2682
' , whatHappened , '
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
No checkin performed.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2685
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2686
                    ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2687
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2688
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2689
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2690
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
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2693
        "/ now check it in again
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2694
        "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2695
        self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2696
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2697
        logMsg := logMsg replChar:$" withString:'\"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2698
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2699
        OperatingSystem isUNIXlike ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2700
            "/ save the log message into another tempFile ...
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2701
            s := FileStream newTemporaryIn:tempdir.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2702
            s nextPutAll:logMsg.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2703
            s close.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2704
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2705
            cmd := 'commit -F "', s fileName baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2706
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2707
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2708
            "/ 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
  2709
            "/ CVS V1.9.16 to stdout.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2710
            "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2711
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2712
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2713
        (self
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2714
            executeCVSCommand:cmd
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2715
            module:moduleDir
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2716
            inDirectory:tempdir name
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2717
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2718
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2719
                whatHappened := cmdOut contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2720
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2721
                whatHappened := '<< no message >>'
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
            self warn:'The following problem was reported by cvs:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2724
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2725
' , whatHappened , '
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2726
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2727
The class has NOT been checked into the repository.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2728
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2729
            self reportError:'cannot checkin modified class source'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2730
            ^ false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2731
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2732
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2733
            whatHappened := cmdOut contentsAsString.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2734
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2735
            whatHappened := nil
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2736
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2737
    ] ensure:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2738
        OsError handle:[:ex |
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2739
            Dialog warn:('Warning: some problem encountered when trying to remove a temporary workfile:\\%1\\The checkin was successful, though.\Please remove those temporary files later.' withCRs
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2740
                        bindWith:ex description).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2741
            ex proceed.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2742
        ] do:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2743
            tempdir notNil ifTrue:[ tempdir recursiveRemove ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2744
            cmdOut notNil ifTrue:[ cmdOut remove ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2745
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2746
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2747
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2748
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2749
    "/ 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
  2750
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2751
    (whatHappened isEmptyOrNil) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2752
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2753
    ] ifFalse:[
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2754
        whatHappened := whatHappened asCollectionOfLines.
4229
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2755
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2756
        idx == 0 ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2757
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2758
        ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2759
            l := whatHappened at:idx.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2760
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2761
        ]
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
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2764
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2765
    "/ 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
  2766
    "/   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
  2767
    "/   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
  2768
    "/   the newly checked in version.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2769
    "/   (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
  2770
    "/    correctly for all unchanged methodss)
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2771
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2772
    "/ 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
  2773
    "/ other version):
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2774
    "/    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
  2775
    "/    and add a 'm' (for merged).
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2776
    "/    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
  2777
    "/
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2778
    newRevision notNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2779
        (didMerge or:[conflictResolvedManually]) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2780
            "/ new code:
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2781
            cls revisionString notEmptyOrNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2782
                newRevision isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2783
                    '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
  2784
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2785
                    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
  2786
                    newString isNil ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2787
                        '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
  2788
                    ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2789
                        self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2790
                        cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2791
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2792
                        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2793
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2794
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2795
                self activityNotification:'Done.'.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2796
            ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2797
                self activityNotification:'CVS: Fetch new revision number of ', cls name.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2798
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2799
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2800
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2801
                    force ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2802
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2803
                    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2804
                ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2805
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2806
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2807
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2808
                ] ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2809
                    entry := (changeLog at:#revisions) first.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2810
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2811
                    self updateVersionMethodOf:cls for:newString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2812
                    cls revision ~= newRevision ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2813
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
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
                ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2816
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2817
        ] ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2818
            "/ 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
  2819
            "/ (to get a new conflict in the next check-in)
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
            "/ 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
  2822
            didMerge ifTrue: [
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2823
                newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2824
                newString notNil ifTrue:[ self updateVersionMethodOf:cls for:newString ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2825
            ]
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2826
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2827
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2828
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2829
    Class addChangeRecordForClassCheckIn:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2830
    self postCheckInClass:cls.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2831
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2832
    conflictResolvedManually ifTrue:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2833
        (Dialog
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2834
            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
  2835
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
  2836
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
  2837
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
  2838
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2839
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
  2840
            title:'Code Merged'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2841
            yesLabel:'OK' noLabel:'Update (Load Merged Code)'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2842
        ) ifFalse:[
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2843
            self utilities
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2844
                checkoutClass:cls
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2845
                askForRevision:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2846
                askForMerge:false
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2847
                askForConfirmation:false.
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2848
        ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2849
    ].
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2850
    ^ true
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2851
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2852
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2853
     SourceCodeManager checkinClass:Array logMessage:'testing only'
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2854
    "
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2855
ea8a74a778ce #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4228
diff changeset
  2856
    "Created: / 13-03-2017 / 15:38:19 / stefan"
4232
f02d9d68eabc #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 4229
diff changeset
  2857
    "Modified: / 31-03-2017 / 15:42:32 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  2858
    "Modified: / 18-05-2018 / 12:53:43 / Stefan Vogel"
4229
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
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2861
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2862
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2863
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2864
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2865
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2866
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2867
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2868
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2869
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2870
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2871
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2872
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2873
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2874
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2875
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2876
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2877
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2878
    self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2881
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2882
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2883
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2884
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2885
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2886
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2887
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2888
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2889
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2891
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2892
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2893
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2894
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2895
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2896
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2897
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2898
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2899
            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
  2900
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2901
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2902
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2903
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2904
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2905
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2906
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2907
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2910
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2911
    "Created: / 23-08-2006 / 14:07:05 / cg"
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  2912
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2914
3866
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2915
getSourceStreamFor:aClass revision:aRevisionStringOrNil
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2916
    "extract a classes source code and return an open readStream on it.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2917
     A revision of nil selects the current (in image) revision.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2918
     The classes source code is extracted using the revision and the sourceCodeInfo,
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2919
     which itself is extracted from the classes packageString."
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2920
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2921
    |cacheIt|
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2922
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2923
    "/ never cache symbolic versions
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2924
    cacheIt := (aRevisionStringOrNil isNil or:[ aRevisionStringOrNil first isDigit ]).
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2925
    ^ self getSourceStreamFor:aClass revision:aRevisionStringOrNil cache:cacheIt
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2926
!
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2927
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2928
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2929
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2930
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2932
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
     to validate the correct container against the class.
4312
b71003f7a8d5 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4310
diff changeset
  2934
     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
  2935
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2936
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2938
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2939
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2940
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2941
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2942
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2943
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2948
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2949
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2952
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2953
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2954
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2955
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2956
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2957
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2958
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2959
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2960
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2961
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2962
    ].
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2963
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2964
        fullName := moduleDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2965
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2966
        fullName := moduleDir , '/' , packageDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2967
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2968
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2969
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2970
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2974
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2975
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2976
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2977
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2978
    "/ 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
  2979
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2980
    "/ 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
  2981
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2982
    "/ (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
  2983
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2984
   (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
  2985
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2986
            ('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
  2987
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2988
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2989
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2990
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2991
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2992
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2993
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2994
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2999
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3000
    "/ 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
  3001
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3002
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3003
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3004
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3005
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3006
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3007
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3008
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3009
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3010
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3011
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3012
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3013
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3015
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3016
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3017
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3018
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3019
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3020
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3021
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3022
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3023
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3024
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3025
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3026
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3027
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3028
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3029
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3030
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3031
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3032
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3033
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3034
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3035
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3036
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3037
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3038
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3039
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3040
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3041
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3042
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3043
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3044
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3045
        self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3046
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3047
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3048
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3049
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3050
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3051
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3052
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3053
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3054
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3055
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3056
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3057
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3058
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3059
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3060
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3061
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3062
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3063
"/        "/ 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
  3064
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3065
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3066
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3067
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3068
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3069
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3070
"/            ('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
  3071
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3072
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3073
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3074
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3075
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3076
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3077
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3078
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3079
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3080
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3081
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3082
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3083
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3084
            ('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
  3085
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3086
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3087
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3088
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3089
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3090
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3091
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3092
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3093
                fullTempName moveTo:fullCachedName.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3094
                self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3095
            ]) ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3096
                self activityNotification:'CVS: Not cached.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3097
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3098
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3099
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3100
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3101
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3102
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3103
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3104
            fileName = 'extensions.st' ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3105
                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
  3106
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3107
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3108
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3109
                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
  3110
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3111
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3112
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3113
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3114
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3115
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3116
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3117
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3118
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3119
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3120
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3121
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3122
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3123
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3124
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3125
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3126
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3127
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3128
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3129
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3130
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3131
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3132
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3133
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3134
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3135
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3136
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3137
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3138
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3139
    "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
  3140
    "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
  3141
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3146
checkForExistingContainer:fileName inModule:moduleName directory:packageDirName
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3147
    "check for a container to exist. Return a boolean result."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3148
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3149
    |fullName cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3150
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3151
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3152
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3153
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3154
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3155
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3156
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3158
    packageDirName isEmptyOrNil ifTrue:[
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3159
        fullName := moduleName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3160
    ] ifFalse:[ 
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3161
        fullName := moduleName , '/' , packageDirName , '/' , fileName.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3162
    ].
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3163
    
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3164
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3165
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3166
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3167
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3168
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3169
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3170
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3171
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3172
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3173
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3174
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3175
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3177
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3178
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3179
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3180
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3181
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3182
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3183
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3184
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3185
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3186
    "/ 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
  3187
    "/ (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
  3188
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3189
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3190
    cmd := '-n rtag -F dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3191
    ^ [  
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3192
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3193
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3194
        
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3195
        SourceCodeManagerError handle:[:ex |
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3196
            ^ false.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3197
        ] do:[    
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3198
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3199
                executeCVSCommand:cmd , fullName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3200
                module:moduleName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3201
                "/ 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
  3202
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3203
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3204
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3205
                log:false
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3206
                outputTo:outputStream
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3207
                errorTo:errorStream.
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3208
    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3209
            "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
  3210
             is returned even if the file does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3211
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3212
            "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
  3213
            "/ cg: read comment above.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3214
            errorStream isEmpty 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3215
                or:[errorStream contents asCollectionOfLines 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3216
                       allSatisfy:[:l | l isBlank or:[l includesString:'WARNING:']]].
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3217
        ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3221
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3222
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3224
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3225
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3226
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3227
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3228
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3229
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3230
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3231
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3234
    "Created: / 13-09-2006 / 18:20:36 / cg"
4220
5f58a2fda23f #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 4196
diff changeset
  3235
    "Modified (format): / 24-02-2017 / 11:32:37 / cg"
4257
9e51055344d5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4256
diff changeset
  3236
    "Modified: / 21-09-2017 / 11:00:40 / stefan"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3237
    "Modified: / 18-05-2018 / 13:42:15 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3243
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3244
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3245
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3246
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3247
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3248
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3249
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3250
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3251
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3252
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3253
    self activityNotification:'CVS: Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3254
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3255
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3256
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3257
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3258
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3259
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3260
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3262
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3263
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3264
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3265
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3266
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3267
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3268
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3269
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3270
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3271
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3272
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3273
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3274
        cmd := '-n rtag -l dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3275
        ret := [
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3276
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3277
                executeCVSCommand:cmd , moduleDir 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3278
                module:moduleDir
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3279
                "/ 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
  3280
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3281
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3282
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3283
                log:false.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3284
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3285
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3286
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3288
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3289
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3290
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3291
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3292
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3293
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3294
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3296
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3297
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3299
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3300
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3302
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3304
    "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
  3305
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3306
    "Modified: / 19-08-2011 / 10:38:35 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3307
    "Modified: / 18-05-2018 / 12:49:05 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3308
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3309
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3310
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3311
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3312
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3313
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3314
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3315
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3316
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3317
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3318
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3319
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3320
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3321
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3322
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3323
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3324
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3325
    self activityNotification:'CVS: Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3326
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3327
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3328
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3329
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3331
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3332
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3333
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3334
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3335
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3336
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3337
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3338
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3339
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3340
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3341
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3342
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3343
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3344
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3345
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3346
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3347
        cmd := '-n rtag -l -F dummy '.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3348
        ret := [
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3349
            self 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3350
                executeCVSCommand:cmd, fullName 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3351
                module:moduleDir
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3352
                "/ 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
  3353
                "/ with a different CVSRoot in its CVS/Root file ...
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3354
                "/ cvs would complain then.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3355
                inDirectory:(tempDir pathName) 
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3356
                log:false.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3357
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3358
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3362
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3363
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3365
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3366
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3367
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3368
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3369
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3370
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3371
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3372
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3373
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3375
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3376
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3377
    "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
  3378
    "Created: / 23-08-2006 / 14:03:03 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  3379
    "Modified: / 18-05-2018 / 12:49:39 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3382
createBranch:branchName forClasses:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3383
    "create a branch"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3384
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3385
    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
  3386
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3387
    "Created: / 04-12-2017 / 18:47:06 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3388
    "Modified: / 07-12-2017 / 10:24:42 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3389
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3390
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3391
createBranch:branchName pathes:aCollectionOfPathNames
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3392
    "create a branch"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3393
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3394
    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
  3395
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3396
    "Created: / 04-12-2017 / 18:56:30 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  3397
    "Modified: / 07-12-2017 / 10:24:47 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3398
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  3399
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3404
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3407
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3408
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3409
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3410
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3417
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3418
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3419
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3420
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3421
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3429
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3430
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3431
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3432
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
        ^ false.
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
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3453
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3454
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3457
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3467
    self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3482
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3494
    self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3518
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    ].
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3533
    whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3544
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
    "/ (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
  3583
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3600
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3611
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3612
    "Modified: / 12-11-2010 / 11:04:42 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3613
    "Modified: / 09-05-2018 / 19:26:53 / stefan"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3628
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3629
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3630
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3631
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3632
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3640
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
            ^ false
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
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3670
        self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3691
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3696
        self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3720
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
        ].
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3734
        whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3741
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3745
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3754
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3755
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3756
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3757
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3773
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3774
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3782
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3783
    "Modified: / 12-11-2010 / 11:04:55 / cg"
4317
cd484d424033 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4312
diff changeset
  3784
    "Modified: / 09-05-2018 / 19:27:06 / stefan"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3794
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3795
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3796
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3797
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3798
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3799
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3808
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3809
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3836
    "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
  3837
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3838
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3841
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3842
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3844
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3850
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3851
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3856
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3857
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3858
        ('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
  3859
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3863
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3878
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3879
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3880
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3883
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3884
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3885
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3890
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3893
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3894
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3895
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3896
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3897
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3905
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3906
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3907
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3908
        tempdir recursiveRemove.
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
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3916
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3918
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3920
    "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
  3921
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3922
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3924
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3925
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
  3926
    "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
  3927
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3928
    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
  3929
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3930
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3931
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3932
        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
  3933
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3934
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3935
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3936
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
  3937
    "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
  3938
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3939
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3942
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3943
     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
  3944
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3946
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3947
    "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
  3948
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3949
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3950
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3951
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3952
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3953
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3954
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3955
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3956
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3957
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3958
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3959
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3960
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3961
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3962
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3963
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3965
    "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
  3966
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3967
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3969
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3970
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3971
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3972
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3973
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3974
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3975
    "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
  3976
     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
  3977
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3978
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3979
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3980
    self activityNotification:'CVS: Fetching list of directories...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3981
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3982
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3983
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3984
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3985
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3986
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3987
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3988
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3989
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3990
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3991
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3992
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3993
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3994
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3995
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3996
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3997
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3998
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3999
    |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
  4000
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4001
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4002
    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
  4003
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4004
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4005
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4006
                        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
  4007
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4008
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4009
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4010
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4011
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4012
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4013
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4014
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4015
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4016
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4017
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4018
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4019
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4020
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4021
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4022
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4023
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4024
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4025
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4026
                "/ '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
  4027
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4028
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4029
                    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
  4030
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4031
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4032
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4033
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4034
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4035
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4036
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4037
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4038
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4039
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4040
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4041
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4042
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4043
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4044
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4045
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4046
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4047
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4048
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4049
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4050
     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
  4051
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4052
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4053
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4054
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4055
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4056
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4057
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4058
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4059
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4060
    self activityNotification:'CVS: Fetching list of containers...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4061
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4062
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4063
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4064
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4065
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4066
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4067
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4068
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4069
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4070
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4071
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4072
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4073
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4074
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4075
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4076
    "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
  4077
     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
  4078
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4079
    |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
  4080
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4081
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4082
         "/ 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
  4083
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4084
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4085
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4086
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4087
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4088
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4089
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4090
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4091
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4092
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4093
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4094
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4095
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4096
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4097
        modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4098
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4099
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4100
    ].        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4101
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4102
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4103
    [
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4104
        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
  4105
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4106
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4107
                        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
  4108
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4109
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4110
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4111
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4112
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4113
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4114
            ('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
  4115
            "/ 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
  4116
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4117
                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
  4118
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4119
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4120
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4121
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4122
            "/ 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
  4123
            "/ 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
  4124
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4125
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4126
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4127
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4128
                log:true 
4100
fcabc1395987 #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 4094
diff changeset
  4129
                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
  4130
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4131
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4132
            "/ 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
  4133
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4134
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4135
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4136
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4137
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4138
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4139
                        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
  4140
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4141
                            (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
  4142
                                "/ 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
  4143
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4144
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4145
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4146
                        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
  4147
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4148
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4149
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4150
                                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
  4151
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4152
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4153
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4154
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4155
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4156
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4157
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4158
        ('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
  4159
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4160
        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
  4161
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4162
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4166
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4167
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4168
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4169
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4170
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4171
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4172
    "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
  4173
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4174
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4175
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4176
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4177
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4178
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4179
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4180
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4181
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4182
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4183
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4184
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4185
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4186
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4187
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4188
pathesForClasses:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4189
    "helper - collect the pathnames for a collection of classes"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4190
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4191
    |paths alreadyWarned|
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4192
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4193
    alreadyWarned := 0.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4194
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4195
    paths := aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4196
                collect:[:cls |
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4197
                    |info path answer|
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4198
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4199
                    cls isLoaded ifFalse:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4200
                        Transcript showCR:('Cannot handle unloaded class: %1.' bindWith:cls name).
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4201
                        alreadyWarned == 0 ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4202
                            Dialog warn:('Cannot handle unloaded class: %1.' bindWith:cls name).
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4203
                            alreadyWarned := alreadyWarned + 1.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4204
                        ] ifFalse:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4205
                            alreadyWarned == 1 ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4206
                                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
  4207
                                answer isNil ifTrue:[^ self].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4208
                                answer == true ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4209
                                    alreadyWarned := alreadyWarned + 1.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4210
                                ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4211
                            ]
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4212
                        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4213
                        nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4214
                    ] ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4215
                        info := self sourceInfoOfClass:cls.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4216
                        info isNil ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4217
                            Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4218
                            nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4219
                        ] ifFalse:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4220
                            path := info at:#pathInRepository ifAbsent:nil.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4221
                            path isNil ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4222
                                Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4223
                            ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4224
                            path
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4225
                        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4226
                    ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4227
                ]
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4228
                thenSelect:[:path | path notNil].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4229
    ^ paths
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4230
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4231
    "Created: / 04-12-2017 / 18:48:30 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4232
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  4233
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4234
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4235
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4237
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4238
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4239
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4240
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4241
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4242
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4243
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4244
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4245
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4246
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4247
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4248
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4249
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4250
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4251
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4252
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4253
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4254
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4255
    self activityNotification:'CVS: Removing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4256
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4257
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4258
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4259
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4260
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4261
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4262
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4263
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4264
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4265
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4266
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4267
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4269
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4270
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4271
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4273
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4274
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4275
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4276
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4277
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4278
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4279
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4280
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4281
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4282
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4283
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4284
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4285
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4286
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4287
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4288
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4289
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4291
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4292
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4293
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4294
    self activityNotification:'CVS Committing removal of ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4296
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4297
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4298
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4299
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4300
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4301
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4302
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4303
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4304
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4305
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4306
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4307
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4309
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4310
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4311
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4312
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4313
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4314
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4315
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4316
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4317
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4318
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4319
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4320
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4321
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4322
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4323
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4324
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4325
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4326
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4327
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4328
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4329
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4330
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4331
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4332
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4333
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4334
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4335
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4336
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4337
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4338
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4339
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4340
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4341
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4342
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4343
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4344
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4345
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4346
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4347
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4348
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4349
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4350
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4351
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4352
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4353
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4354
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4355
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4356
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4357
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4358
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4359
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4360
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4361
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4362
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4363
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4364
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4365
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4366
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4367
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4368
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4369
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4370
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4371
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4372
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4373
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4374
     filterRep may be a collection of repository names 
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4375
     (i.e. 'stx', 'exept', 'phx' etc.) to only report changes made to one
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4376
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4377
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4378
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4379
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4380
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4381
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4382
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4383
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4384
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4385
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4387
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4388
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4390
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4391
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4394
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4398
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4399
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4400
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4401
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4403
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4406
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4407
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4408
        cmd := cmd , ' history -x ARMT -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4409
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4410
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4417
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4421
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4422
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4423
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4424
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4425
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4426
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4427
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4428
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4429
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4430
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4431
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4444
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
                        words := line asCollectionOfWords.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4452
                        words size < 7 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4454
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4455
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4459
                            recordType = 'T' ifTrue:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4460
                                rev := words at:7.   "something like [expecco_2_8_0:HEAD]"
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4461
                                module := fileName := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4462
                                fileName := fileName copyAfterLast:$/.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4463
                            ] ifFalse:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4464
                                rev := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4465
                                fileName := words at:7.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4466
                                pkgDir := words at:8.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4467
                                module := pkgDir.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4468
                            ].
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4469
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4470
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
                                    time := words at:3.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4473
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4474
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4475
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4476
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4477
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4478
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4479
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4480
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4482
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4483
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4484
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4485
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4486
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4487
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4488
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4489
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4490
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4491
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4492
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4493
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4494
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4495
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4496
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4497
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4498
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4499
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4500
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4501
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4502
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4503
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4504
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4505
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4506
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4507
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4508
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4509
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4510
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4511
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4512
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4513
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4514
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4515
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4516
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4517
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4518
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4519
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4520
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4521
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4522
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4523
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4524
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4525
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4526
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4527
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4528
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4530
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4531
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4532
    "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
  4533
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4534
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4536
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4537
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4538
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4539
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4540
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4541
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4542
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4543
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4544
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4545
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4546
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4547
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4548
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4549
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4550
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4551
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4552
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4553
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4554
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4555
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4556
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4557
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4559
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4560
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4561
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4562
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4563
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4564
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4565
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4566
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4567
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4568
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4569
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4570
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4571
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4572
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4573
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4574
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4575
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4576
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4577
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4578
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4579
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4580
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4581
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4582
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4583
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4584
            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
  4585
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4586
            "/ 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
  4587
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4588
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4589
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4590
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4591
            "/ temporary fix Felix' bad string translation:
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  4592
            (aString startsWith:'§Header:') ifTrue:[
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  4593
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4594
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4595
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4596
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4597
                        autoFixHolder value ifFalse:[
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  4598
                            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
  4599
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4600
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4601
                        (autoFixHolder value 
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  4602
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4603
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4604
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4605
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4606
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4607
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4608
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4609
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  4610
            "/ 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
  4611
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4612
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4613
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4614
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4615
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4616
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4617
                            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
  4618
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4619
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4620
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4621
                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Umlaut remover-bug). Fix it?' withCRs bindWith:aClass name) ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4622
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4623
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4624
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4625
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4626
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4627
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4628
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4629
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4630
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4631
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4632
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4633
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4634
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4635
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4636
                            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
  4637
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4638
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4639
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4640
                            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
  4641
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4642
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4643
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4644
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4645
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4646
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4647
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4648
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4649
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4650
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4651
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4652
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4653
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4654
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4655
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4656
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4657
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4658
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4659
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4660
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4661
revisionLogOf:clsOrNil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4662
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4663
    fileName:classFileName directory:packageDir module:moduleDir
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4664
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4665
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4666
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4667
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4668
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4669
     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
  4670
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4671
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4672
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4673
     filled with:
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4674
            #container          -> the CVS container file name
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4675
            #cvsRoot            -> the CVS root (repository)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4676
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4677
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4678
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4679
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4680
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4681
            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
  4682
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4683
              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
  4684
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4685
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4687
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4688
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4689
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4690
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4691
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4692
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4693
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4694
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4695
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4696
              #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
  4697
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4698
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4699
            revisions are ordered newest first
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4700
            (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
  4701
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4702
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4703
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4704
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4705
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4706
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4707
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4708
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4709
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4710
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4711
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4712
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4713
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4714
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4715
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4716
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4717
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4718
        packageDir isEmptyOrNil ifTrue:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4719
            modulePath := moduleDir
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4720
        ] ifFalse:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4721
            modulePath :=  moduleDir , '/' , packageDir.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4722
        ].
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4723
        classFileName isNil ifTrue:[
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4724
            fullName :=  modulePath , '/' , (clsOrNil classFilename).
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4725
        ] ifFalse:[    
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4726
            fullName :=  modulePath , '/' , classFileName.
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4727
        ].
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4728
        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4729
        self use_rlog ifFalse:[
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4730
            self createEntryFor:fullName
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4731
                 module:moduleDir
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4732
                 in:(tempDir construct:modulePath)
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4733
                 revision:'1.1'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4734
                 date:'dummy'
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4735
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4736
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4737
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4738
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4739
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4740
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4741
        (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
  4742
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4743
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4744
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4745
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4746
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4747
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4748
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4749
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4750
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4751
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4752
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4753
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4754
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4755
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4756
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4757
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4758
            msg := 'CVS: Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4759
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4760
            msg := 'CVS: Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4761
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4762
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4763
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4764
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4765
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4766
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4767
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4768
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4769
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4770
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4771
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4772
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4773
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4774
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4775
        inStream := self
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4776
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName)
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4777
                        module:moduleDir
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4778
                        inDirectory:tempDir
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4779
                        log:true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4780
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4781
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4782
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4783
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4784
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4785
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4786
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4788
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4789
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4790
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4791
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4792
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4793
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4794
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4795
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4796
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4797
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4798
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4799
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4800
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4801
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4802
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4803
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4804
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4805
                        s := line restAfter:word withoutSeparators:true.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4806
                        s notNil ifTrue:[info at:key put:s. gotIt := true].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4807
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4808
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4809
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4810
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4811
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4812
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4813
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4814
                        line:= inStream nextLine.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4815
                        [line notNil
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4816
                         and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4817
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4818
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4819
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4820
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4821
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4822
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4823
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4824
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4825
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4826
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4827
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4828
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4829
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4830
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4831
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4832
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4833
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4834
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4835
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4836
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4837
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4838
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4839
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4840
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4841
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4842
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4843
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4844
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4845
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4846
            "/
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4847
            "/ continue to read the commands pipe output
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4848
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4849
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4850
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4851
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4852
                    "/ suppress warning. if we try to get the info of a non-existing revision"
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4853
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4854
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4855
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4856
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4857
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4858
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4859
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4860
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4861
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4862
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4863
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4864
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4865
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4866
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4867
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4868
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4869
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4870
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4871
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4872
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4873
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4874
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4875
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4876
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4877
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  4878
            OsError handle:[:ex |
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4879
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4880
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4881
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4882
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4883
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4884
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4885
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4886
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4887
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4888
    "
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4889
     SourceCodeManager revisionLogOf:Array
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4890
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4891
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4892
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4893
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  4894
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4895
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4896
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4897
    "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
  4898
    "Modified: / 29-01-1997 / 16:51:30 / stefan"
4289
6c076e9881d9 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4280
diff changeset
  4899
    "Modified: / 06-12-2017 / 11:46:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4900
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4901
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4902
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4903
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4904
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4905
     each filled with:
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4906
            #container          -> the CVS container file name 
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4907
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4908
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4909
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4910
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4911
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4912
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4913
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4914
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4915
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4916
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4917
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4918
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4919
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4920
             -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
  4921
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4922
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4923
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4924
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4925
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4926
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4927
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4928
              #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
  4929
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4930
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4931
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4932
            (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
  4933
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4934
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4935
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4936
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4937
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4938
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4939
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4940
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4941
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4942
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4943
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4944
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4945
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4946
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4947
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4948
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4949
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4950
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4951
        ].
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4952
        self use_rlog ifFalse:[
4310
0b4045ea2154 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4298
diff changeset
  4953
            self halt:'non-rlog no longer supported'.
0b4045ea2154 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4298
diff changeset
  4954
            ^ self.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4955
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4956
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4957
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4958
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4959
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4960
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4961
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4962
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4963
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4964
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4965
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4966
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4967
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4968
            msg := 'CVS: Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4969
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4970
            msg := 'CVS: Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4971
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4972
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4973
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4974
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4975
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4976
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4977
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4978
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4979
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4980
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4981
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4982
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4983
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4984
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4985
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4986
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4987
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4988
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4989
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4990
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4991
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4992
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4993
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4994
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4995
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4996
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4997
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4998
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4999
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5000
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5001
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5002
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5003
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5004
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5005
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5006
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5007
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5008
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5009
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5010
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5011
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5012
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5013
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5014
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5015
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5016
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5017
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5018
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5019
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5020
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5021
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5022
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5023
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5024
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5025
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5026
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5027
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5028
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5029
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5030
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5031
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5032
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5033
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5034
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5035
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5036
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5037
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5038
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5039
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5040
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5041
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5042
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5043
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5044
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5045
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5046
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5047
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5048
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5049
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5050
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5051
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5052
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5053
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5054
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5055
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5056
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5057
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5058
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5059
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5060
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5061
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5062
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5063
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5064
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5065
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5066
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5067
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5068
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5069
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5070
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5071
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5072
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5073
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5074
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  5075
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5076
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5077
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5078
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5079
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5080
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5081
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5082
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5083
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5084
            OsError handle:[:ex |
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5085
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5086
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5087
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5088
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5089
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5090
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5091
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5092
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5093
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5094
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5095
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5096
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5097
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5098
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5099
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5100
    "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
  5101
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5102
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5103
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5104
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5105
    tempDir := nil.         "use the current directory"
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5106
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5107
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5108
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5109
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5110
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5111
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5112
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5113
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5114
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5115
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5116
    ].
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5117
    info := [
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5118
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5119
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5120
        self activityNotification:('CVS: Fetching revision infos for %1%2'
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5121
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5122
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5123
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5124
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5125
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5126
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5127
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5128
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5129
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5130
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5131
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5132
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5133
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5134
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5135
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5136
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5137
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5138
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5139
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5140
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5141
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5142
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5143
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5144
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5145
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5146
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5147
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5148
        self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5149
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5150
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5151
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5152
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5153
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5154
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5155
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5156
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5157
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5158
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5159
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5160
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5161
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5162
    "Created: / 12-10-2006 / 10:12:59 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5163
    "Modified: / 18-05-2018 / 12:50:53 / Stefan Vogel"
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5164
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5165
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5166
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5167
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5168
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5169
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5170
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5171
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5172
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5173
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5174
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5175
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5176
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5177
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5178
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5179
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5180
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5181
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5182
    ].        
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5183
    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
  5184
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5185
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5186
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5187
    info := [
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5188
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5189
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5190
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5191
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5192
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5193
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5194
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5195
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5196
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5197
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5198
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5199
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5200
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5201
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5202
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5203
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5204
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5205
        "/
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5206
        self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5207
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5208
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5209
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5210
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5211
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5212
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5213
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5214
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5215
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5216
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5217
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5218
    "Created: / 12-10-2006 / 10:12:59 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5219
    "Modified: / 18-05-2018 / 12:51:12 / Stefan Vogel"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5220
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5221
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5222
setSymbolicName:symbolicName asBranch:asBranch revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5223
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5224
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5225
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5226
     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
  5227
     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
  5228
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5229
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5230
4294
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5231
    |paths|
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5232
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5233
    paths := self pathesForClasses:aCollectionOfClasses.
13c16e970531 #DOCUMENTATION by mawalch
mawalch
parents: 4292
diff changeset
  5234
    self setSymbolicName:symbolicName asBranch:asBranch revision:rev overWrite:overWriteBool pathes:paths
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5235
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5236
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5237
     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
  5238
     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
  5239
     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
  5240
     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
  5241
     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
  5242
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5243
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5244
    "Created: / 04-12-2017 / 18:53:08 / cg"
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5245
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5246
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5247
setSymbolicName:symbolicNameArg asBranch:asBranch revision:rev overWrite:overWriteBool pathes:pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5248
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5249
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5250
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5251
     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
  5252
     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
  5253
     If multiple paths are given, the revision MUST be nil."
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5254
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5255
    |argumentString result errorStream outStream moduleDirs symbolicName cvsErrorOutput cvsOutput|
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5256
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5257
    symbolicName := (symbolicNameArg includes:Character space)
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5258
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5259
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5260
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5261
    pathsInRepository size > 1 ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5262
        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
  5263
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5264
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5265
    moduleDirs := pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5266
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5267
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5268
                    ] as:Set.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5269
    moduleDirs do:[:moduleDir |
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5270
        |pathsInModule pathsInModuleAsArgument|
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5271
4239
635990f888e1 #DOCUMENTATION by mawalch
mawalch
parents: 4233
diff changeset
  5272
        pathsInModule := pathsInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5273
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5274
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5275
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5276
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5277
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5278
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5279
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5280
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5281
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5282
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5283
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5284
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5285
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5286
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5287
        ].
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5288
        asBranch ifTrue:[
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5289
            argumentString := '-b ',argumentString.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5290
        ].
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5291
        
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5292
        pathsInModuleAsArgument := pathsInModule
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5293
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5294
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5295
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5296
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5297
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5298
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5299
                                        ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5300
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5301
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5302
        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
  5303
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5304
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5305
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5306
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5307
        result := self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5308
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathsInModuleAsArgument)
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5309
                    module:moduleDir
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5310
                    inDirectory:nil
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5311
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5312
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5313
                    errorTo:errorStream.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5314
                    
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5315
        self activityNotification:nil.
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5316
        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
  5317
        (result not or:[errorStream size ~~ 0]) ifTrue:[
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5318
            SourceCodeManagerError raiseRequestWith:cvsErrorOutput errorString:' cvs tag failed: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5319
        ] ifFalse:[
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5320
            cvsOutput := outStream contents.
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5321
            (cvsOutput asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5322
                SourceCodeManagerError raiseRequestWith:cvsOutput errorString:' cvs tag could not be set: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5323
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5324
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5325
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5326
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5327
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5328
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5329
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5330
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5331
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5332
        setSymbolicName:'test1'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5333
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5334
        overWrite:true
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5335
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5336
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5337
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5338
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5339
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5340
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5341
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5342
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5343
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5344
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5345
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5346
        revision:0
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5347
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5348
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5349
                  '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
  5350
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5351
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5352
    "Created: / 04-12-2017 / 18:52:14 / cg"
4292
edbabb3f6941 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4289
diff changeset
  5353
    "Modified (comment): / 07-12-2017 / 10:20:02 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5354
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5355
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5356
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5357
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5358
     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
  5359
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5360
     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
  5361
     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
  5362
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5363
     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
  5364
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5365
    self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5366
        setSymbolicName:symbolicName 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5367
        revision:rev 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5368
        overWrite:overWriteBool 
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5369
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5370
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5371
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5372
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5373
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5374
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5375
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5376
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5377
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5378
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5379
    "Created: / 12-09-2006 / 12:56:52 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5380
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5381
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5382
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5383
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5384
     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
  5385
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5386
     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
  5387
     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
  5388
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5389
     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
  5390
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5391
    self setSymbolicName:symbolicName asBranch:false revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5392
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5393
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5394
     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
  5395
     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
  5396
     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
  5397
     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
  5398
     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
  5399
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5400
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5401
    "Created: / 12-09-2006 / 12:58:23 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5402
    "Modified: / 04-12-2017 / 18:53:26 / cg"
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5403
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5404
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5405
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool path:pathInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5406
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5407
     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
  5408
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5409
     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
  5410
     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
  5411
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5412
     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
  5413
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5414
    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
  5415
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5416
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5417
     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
  5418
     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
  5419
     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
  5420
     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
  5421
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5422
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5423
    "Modified: / 12-09-2006 / 12:37:20 / cg"
4280
f4fb6e5cd1fb #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4273
diff changeset
  5424
    "Modified (format): / 05-12-2017 / 22:56:04 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5425
!
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5426
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5427
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5428
    "set a symbolicName for revision rev.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5429
     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
  5430
     If rev is 0, delete the symbolic name.
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5431
     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
  5432
     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
  5433
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5434
     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
  5435
     If multiple paths are given, the revision MUST be nil."
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5436
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5437
    self setSymbolicName:symbolicNameArg asBranch:false revision:rev overWrite:overWriteBool pathes:pathsInRepository
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5438
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5439
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5440
     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
  5441
     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
  5442
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5443
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5444
        setSymbolicName:'test1'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5445
        revision:nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5446
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5447
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5448
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5449
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5450
        setSymbolicName:'test2'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5451
        revision:nil
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5452
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5453
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5454
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5455
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5456
     self
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5457
        setSymbolicName:'test2'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5458
        revision:0
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5459
        overWrite:true
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5460
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5461
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5462
    "
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5463
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5464
    "Created: / 12-09-2006 / 12:36:44 / cg"
4273
fb20d592a066 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4257
diff changeset
  5465
    "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
  5466
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5467
3931
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5468
standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5469
    "utility function: return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5470
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5471
    ^ 'Header: %1/%2/%3,v %4, %5 %6 %7 Exp'
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5472
        bindWith:moduleDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5473
        with:packageDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5474
        with:fileName
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5475
        with:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5476
        with:(Date today printStringFormat:'%y/%m/%d')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5477
        with:(Time now printStringFormat:'%h:%m:%s')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5478
        with:(OperatingSystem getLoginName)
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5479
        
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5480
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5481
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5482
     self 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5483
        revisionStringFor:Array 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5484
        inModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5485
        directory:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5486
        container:'Array.st' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5487
        revision:'123'          
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5488
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5489
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5490
    "Created: / 23-07-2012 / 18:46:29 / cg"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5491
!
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5492
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5493
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5494
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5495
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5496
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5497
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5498
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5499
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5500
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5501
     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
  5502
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5503
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5504
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5505
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5506
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5507
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5508
        modulePath :=  moduleDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5509
    ] ifFalse:[        
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5510
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5511
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5512
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5513
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5514
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5515
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5516
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5517
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5518
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5519
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5520
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5521
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5522
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5523
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5524
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5525
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5526
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5527
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5528
        msg := 'CVS: fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5529
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5530
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5531
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5532
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5533
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5534
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5536
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5537
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5538
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5539
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5540
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5541
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5542
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5543
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5544
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5545
            SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5546
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5547
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5549
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5550
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5551
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5552
        info := IdentityDictionary new.
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5553
        [inStream atEnd not and:[(line:= inStream nextLine) notNil]] whileTrue:[
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5554
            line := line withoutSeparators.
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5555
            line notEmpty ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5556
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5557
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5558
                ((line includesString:'warning')
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5559
                 and:[ (line includesString:'is not')
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5560
                 and:[ (line includesString:'pertinent') ]]) ifTrue:[
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5561
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5562
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5563
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5564
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5565
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5566
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5567
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5568
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5569
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5570
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5571
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5572
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5573
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5574
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5575
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5576
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5577
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5578
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5579
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5580
                ].
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5581
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5582
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5583
        info isEmpty ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5584
            ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5585
            SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5586
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5587
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5588
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5589
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5590
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5591
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5592
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5593
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5594
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5595
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5596
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5597
     SourceCodeManager statusOf:Tools::NewSystemBrowser fileName:'Tools__NewSystemBrowser.st' directory:'libtool' module:'stx'  
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5598
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5599
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5600
    "Modified: / 29-08-2006 / 13:18:00 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5601
    "Modified (comment): / 18-05-2018 / 13:55:10 / Stefan Vogel"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5602
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5603
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5604
!CVSSourceCodeManager class methodsFor:'source code utilities'!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5605
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5606
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5607
    "return info about who changed what and when.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5608
     Return nil on failure.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5609
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5610
     The returned information is a structure entry for each line
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5611
            #revision           -> version of last change
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5612
            #author             -> author 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5613
            #date               -> change date 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5614
        "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5615
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5616
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5617
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5618
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5619
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5620
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5621
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5622
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5623
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5624
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5625
        |cmd revArg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5626
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5627
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5628
        fullName :=  modulePath , '/' , classFileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5629
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5630
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5631
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5632
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5633
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5634
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5635
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5636
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5637
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5638
        msg := 'Fetching annotation log '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5639
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5640
            msg := msg , 'in ' , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5641
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5642
            msg := msg , 'of ', clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5643
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5644
        self activityNotification:msg,'...'.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5645
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5646
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5647
                        executeCVSCommand:('annotate ' , fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5648
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5649
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5650
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5651
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5652
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5653
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5654
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5655
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5656
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5657
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5658
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5659
        "/ read the commands pipe output and extract the info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5660
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5661
        info := IdentityDictionary new.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5662
        inHeaderInfo := true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5663
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5664
            line:= inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5665
            ((line ? '') startsWith:'*******') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5666
                inHeaderInfo := false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5667
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5668
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5669
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5670
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5671
        "/ continue to read the commands pipe output 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5672
        "/ and extract change info records
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5673
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5674
        [inStream atEnd] whileFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5675
            line := inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5676
Transcript showCR:line.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5677
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5678
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5679
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5680
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5681
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5682
            OsError handle:[:ex |
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5683
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5684
            ] do:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5685
                tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5686
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5687
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5688
        self activityNotification:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5689
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5690
    ^ info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5691
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5692
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5693
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5694
        annotationsFor:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5695
        fileName:'Array.st' directory:'libbasic' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5696
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5697
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5698
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5699
        annotationsFor:MenuPanel 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5700
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5701
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5702
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5703
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5704
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
  5705
    "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
  5706
     list of lines, representing the diffs between two revisions.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5707
     experimental (for ownershipGraph).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5708
     Here we ask cvs to give us the diff list"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5709
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5710
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName diffDir|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5711
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5712
    clsOrNil notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5713
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5714
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5715
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5716
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5717
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5718
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5719
4297
4922c41a64d7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4294
diff changeset
  5720
    (cacheIt) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5721
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5722
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5723
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5724
            diffDir := (cacheDir / modulePath / '.diffs').
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5725
            diffDir exists ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5726
                diffDir makeDirectory.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5727
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5728
            cachedFile := diffDir / (classFileName,'_',rev1,'_',rev2).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5729
            cachedFile exists ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5730
                ^ cachedFile contents
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5731
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5732
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5733
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5734
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5735
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5736
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5737
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5738
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5739
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5740
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5741
    list := [
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5742
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5743
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5744
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5745
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5746
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5747
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5748
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5749
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5750
        msg := 'CVS: Fetching diff list of '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5751
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5752
            msg := msg , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5753
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5754
            msg := msg , clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5755
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5756
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5757
        self activityNotification:msg.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5758
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5759
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5760
                        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
  5761
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5762
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5763
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5764
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5765
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5766
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5767
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5768
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5769
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5770
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5771
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5772
        "/ read the command's pipe output, skipping some administrative info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5773
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5774
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5775
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5776
        inStream contents.
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5777
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5778
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5779
        tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5780
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5781
    list := list reject:[:line | line startsWith:'\ '].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5782
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5783
    cachedFile notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5784
        cachedFile contents:list.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5785
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5786
    ^ list
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5787
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5788
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5789
     SourceCodeManager statusOf:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5790
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5791
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5792
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5793
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5794
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5795
    "Modified: / 29-08-2006 / 13:18:00 / cg"
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5796
    "Modified: / 18-05-2018 / 12:50:12 / Stefan Vogel"
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5797
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5798
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5799
initialRCSRevisionStringFor:aClass in:dir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5800
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5801
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5802
    "/ do not make the string below into one string;
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5803
    "/ RCS would expand it into a wrong rev-string
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
    |nm oldRev idx special|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5806
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5807
    nm := fileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5808
    (nm endsWith:',v') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5809
        nm := nm copyButLast:2
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5810
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5811
    (nm endsWith:'.st') ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5812
        nm := nm , '.st'
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
    oldRev := aClass revisionString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5816
    special := ''.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5817
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5818
    oldRev notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5819
        idx := oldRev lastIndexOf:$[.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5820
        idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5821
            idx := oldRev indexOf:$[ startingAt:idx+1.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5822
            idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5823
                special := ' ' , (oldRev copyFrom:idx).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5824
            ]
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
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5827
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
    ^ '$' , 'Header: ' , dir , '/' , fileName , ',v $'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5830
      , special
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5831
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5832
    "Modified: 17.9.1996 / 15:57:15 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5833
    "Created: 14.2.1997 / 20:59:28 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5834
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5835
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5836
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5837
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5838
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5839
    |cvsRoot fullName|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5840
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5841
    cvsRoot := self getCVSROOTForModule:moduleDir.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5842
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5843
    packageDir isEmptyOrNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5844
        fullName := (cvsRoot , '/' , moduleDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5845
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5846
        fullName := (cvsRoot , '/' , moduleDir , '/' , packageDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5847
    ].        
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5848
    ^ self initialRCSRevisionStringFor:aClass in:fullName container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5849
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5850
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5851
    "Created: / 23-08-2006 / 14:05:46 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5852
! !
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5853
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5854
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5855
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5856
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5857
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5858
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5859
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5860
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5861
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5862
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'documentation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5863
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5864
copyright
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5865
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5866
 COPYRIGHT (c) 2009 by eXept Software AG
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5867
              All Rights Reserved
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5868
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5869
 This software is furnished under a license and may be used
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5870
 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
  5871
 inclusion of the above copyright notice.   This software may not
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5872
 be provided or otherwise made available to, or used by, any
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5873
 other person.  No title to or ownership of the software is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5874
 hereby transferred.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5875
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5876
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5877
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5878
documentation
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5879
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5880
    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
  5881
    This has been replaced by instances of VersionInfo and subclasses.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5882
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5883
    CVSVersionInfo adds some CVS specific data.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5884
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5885
    [author:]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5886
        cg (cg@AQUA-DUO)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5887
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5888
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5889
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5890
version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5891
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5892
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5893
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5894
version_CVS
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5895
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5896
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5897
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5898
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'instance creation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5899
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5900
fromRCSString:aString
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5901
    "{ Pragma: +optSpace }"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5902
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5903
    "I know how to parse RCS/CVS version id strings.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5904
     Return an instance filled with revision info which is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5905
     extracted from aString. This must be in RCS/CVS format."
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5906
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5907
    |words firstWord nextWord info nm s fn revString d |
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5908
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5909
    s := aString readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5910
    s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5911
    firstWord := s upToSeparator.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5912
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5913
    info := self new.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5914
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5915
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5916
    "/ supported formats:
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5917
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5918
    "/ $-Header:   pathName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5919
    "/ $-Revision: rev $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5920
    "/ $-Id:       fileName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5921
    "/
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5922
    (firstWord = '$Header:' or:[firstWord = '§Header:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5923
        d := firstWord first.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5924
        s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5925
        nm := s throughAll:',v '.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5926
        nm := nm withoutSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5927
        info repositoryPathName:nm.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5928
        info fileName:(nm asFilename baseName copyButLast:2).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5929
        words := s upToEnd asCollectionOfWords readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5930
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5931
        words atEnd ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5932
            nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5933
            nextWord first ~= d ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5934
                info revision:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5935
                nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5936
                (nextWord notNil and:[nextWord first ~= d]) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5937
                    info date:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5938
                    info time:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5939
                    nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5940
                    (nextWord notNil and:[nextWord startsWithAnyOf:'+-']) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5941
                        info timezone:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5942
                        nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5943
                    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5944
                    info user:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5945
                    info state:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5946
                ]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5947
            ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5948
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5949
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5950
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5951
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5952
    (firstWord = '$Revision:' or:[firstWord = '§Revision:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5953
        info revision:(s upToEnd asCollectionOfWords first).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5954
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5955
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5956
4322
e01f3898946f #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4317
diff changeset
  5957
    (firstWord = '$Id:' or:[firstWord = '§Id:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5958
        "/commented out by Jan Vrany, 2009/10/20
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5959
        "/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
  5960
        "/svn has no support for $ Header $ expansion. Therefore
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  5961
        "/libsvn uses $ Id: $ instead.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5962
        "/self halt:'no longer supported'.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5963
        words := s upToEnd asCollectionOfWords readStream.
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5964
        fn := words next.
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5965
        (fn endsWith:',v') ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5966
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5967
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5968
        ].
4227
c186c159f346 #BUGFIX by mawalch
mawalch
parents: 4220
diff changeset
  5969
        info fileName:(fn copyButLast:2).
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5970
        info revision:(revString := words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5971
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5972
        "/ 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
  5973
        ((revString conform:[:c | c isDigit or:[c == $.]])
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5974
        and:[revString includes:$.]) ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5975
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5976
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5977
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5978
        info date:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5979
        info time:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5980
        info user:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5981
        info state:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5982
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5983
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5984
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5985
    ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5986
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5987
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5988
     CVSVersionInfo fromRCSString:('$' , 'Revision: 1.122 $')
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5989
     CVSVersionInfo fromRCSString:(CVSSourceCodeManager version)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5990
     CVSVersionInfo fromRCSString:(SVNSourceCodeManager version_CVS)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5991
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5992
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5993
    "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
  5994
    "Modified: / 22-11-2011 / 16:15:49 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5995
    "Modified (format): / 24-11-2011 / 10:56:51 / cg"
4228
d063b330da5f #OTHER by mawalch
mawalch
parents: 4227
diff changeset
  5996
    "Modified (format): / 07-03-2017 / 22:25:54 / mawalch"
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5997
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5998
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5999
!CVSSourceCodeManager::CVSVersionInfo methodsFor:'accessing'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6000
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6001
changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6002
    ^ changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6003
!
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
changedLinesInfo:aString
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6006
    changedLinesInfo := aString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6007
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  6008
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6009
repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6010
    ^ repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6011
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6012
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6013
repositoryPathName:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6014
    repositoryPathName := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6015
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6016
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6017
timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6018
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6019
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6020
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6021
timeZone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6022
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6023
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6024
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6025
timezone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6026
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6027
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6028
    "Created: / 22-10-2008 / 20:50:39 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6029
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6030
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6031
timezone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6032
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6033
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6034
    "Created: / 22-10-2008 / 20:50:32 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6035
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  6036
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6037
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6038
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  6039
version
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  6040
    ^ '$Header$'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6041
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6042
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  6043
version_CVS
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  6044
    ^ '$Header$'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  6045
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  6046
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  6047
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  6048
CVSSourceCodeManager initialize!