CVSSourceCodeManager.st
author mawalch
Mon, 15 Aug 2016 12:52:18 +0200
changeset 4075 8087475e8249
parent 4064 ef1fbf4480c0
child 4081 5a9726876c20
child 4084 d39ce0820079
permissions -rw-r--r--
#OTHER by mawalch occure -> occur occurence -> occurrence occures -> occurs occured -> occurred
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     1
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     2
 COPYRIGHT (c) 1995 by Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     5
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    14
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    15
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    16
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    17
	instanceVariableNames:''
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    18
	classVariableNames:'AuthorMap CMD_checkout CVSCommandSemaphore CVSCommandTimeout
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    19
		CVSCommitOptions CVSExecutable CVSModuleRoots CVSRoot CVSTempDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    20
		CVSUpdateOptions DisabledModules RecentTags
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    21
		RecentlyCheckedModulesAndPackages RemoteCVS'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    22
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    23
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    24
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    25
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    26
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    27
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    28
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    29
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    30
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    31
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    32
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    33
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    34
 only in accordance with the terms of that license and with the
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    35
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    36
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    37
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    38
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    40
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    41
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    42
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    43
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    44
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    45
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    46
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    47
    variable being set by a private.rc file).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    48
    Under that top, for each module (especially the stx module itself), 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
    If not specified otherwise, the module defaults to 'stx'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    57
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    60
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
        (foo/bar/x)                     - module defaults to 'stx'; dir is 'foo/bar/x'; library name defaults to x
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    to use the last format (by changing the Make.proto files and add a -P flag to
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
        - Make certain that either no local source directory exists, or it is empty or it contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
          only source code for files NOT found in the repository (this will not be required in future versions).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    85
        currently, the rcs container is accessed directly, since cvs mangles the file's ident-string and
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
        thus does not correctly recreate the original file (all source is offset by some characters w.r.t. the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    88
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    89
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    90
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    91
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    94
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
    96
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    97
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    98
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    99
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   100
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
                                        if false, disk access is used;
3948
mawalch
parents: 3931
diff changeset
   104
                                        files in CVSRoot must be accessible.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
        should acomplish this.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
        from the eXept cvs server (i.e. CVSROOT for them is :pserver:userName@exept.de:/files/CVS/stc).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   190
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   191
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   192
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   193
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   194
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   195
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   196
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   197
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   198
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   199
exeptsPrivateSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   200
    "the actual stx repository as used within exept.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   201
     Only valid within exept"
3918
5e9f77b71b40 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   202
    
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   203
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   204
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   205
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   206
exeptsPublicSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   207
    "the public repository, which is a read-only copy of the exept-internal repository.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   208
     Updated every night." 
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   209
     
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   210
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   211
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   212
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   213
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   214
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   215
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   216
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   217
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   218
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   219
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   220
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   221
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   222
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   223
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   227
4047
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   228
    | s f top |
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   229
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   230
    CVSCommandSemaphore isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   231
        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
   232
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   233
    CVSCommitOptions isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   234
        CVSCommitOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   235
        CVSUpdateOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   236
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   237
    RemoteCVS isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   238
        RemoteCVS := true.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   239
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   240
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   241
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   242
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   243
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   244
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   245
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   246
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   247
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   248
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   250
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   251
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   252
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   253
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   254
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   255
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   256
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   261
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   262
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   263
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   264
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   269
    DefaultManager isNil ifTrue:[
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   270
        DefaultManager := self.    
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   271
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   274
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   275
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   305
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   306
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   307
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   308
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   309
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   310
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   311
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   312
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   313
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   314
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   316
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   317
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   318
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   321
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   322
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   323
    AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
    CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   328
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   333
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   334
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   335
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   336
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   337
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   338
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   339
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   340
    |h addr|
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   341
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   342
    (h := OperatingSystem getHostName) notEmptyOrNil ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   343
        addr := IPSocketAddress hostName:h.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   344
        addr notNil ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   345
            (addr hostAddress startsWith: #[172 23 1]) ifTrue:[
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   346
                self addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   347
            ]
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   348
        ].
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   349
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   350
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   351
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   352
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   353
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   354
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   355
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   356
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   357
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   358
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   359
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   360
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   361
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   362
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   363
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   364
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   365
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   366
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   367
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   368
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   369
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   370
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   371
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   372
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   373
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   374
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   375
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   376
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   377
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   378
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   379
    "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
   380
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   381
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   382
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   383
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   384
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   385
    "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
   386
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   387
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   388
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   389
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   390
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   391
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   392
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   393
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   394
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   395
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   396
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   397
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   398
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   399
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   400
        CVSExecutable := nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   401
    ] ifFalse:[        
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   402
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   403
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   404
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   405
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   406
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   407
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   408
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   409
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   410
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   411
     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
   412
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   413
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   414
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   415
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   416
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   417
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   418
    d exists ifFalse:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   419
        d recursiveMakeDirectory.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   420
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   421
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   422
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   423
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   424
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   425
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   426
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   427
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   428
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   429
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   430
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   431
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   432
     That's the directory, where temporary files are created for checkin/checkout.
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   433
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   434
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   435
    CVSTempDir := aPathNameString
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:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   438
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   439
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   440
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   441
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   442
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   443
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   444
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   445
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   446
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   447
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   448
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   449
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   450
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   451
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   452
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   453
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   454
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   455
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   456
    "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
   457
3848
2768cbd5b7f1 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3834
diff changeset
   458
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   459
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   460
    "
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   461
     self recentTag
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   462
    "
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   463
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   464
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   465
recentTag:aString
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
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   468
    "/ RecentTag := aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   469
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   470
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   471
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   472
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   473
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   474
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   475
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   476
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   477
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   478
    "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
   479
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   480
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   481
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   482
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   483
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   484
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   485
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   486
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   487
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   488
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   489
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   490
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   491
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   492
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   493
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   494
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   495
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   496
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   497
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   498
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   499
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   500
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   501
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   502
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   503
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   504
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   505
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   506
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   507
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   508
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   509
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   510
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   511
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   512
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   514
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   517
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   518
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   519
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   520
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   521
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   522
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   523
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   525
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   527
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   528
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   529
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   531
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   533
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   546
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   557
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   558
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   559
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   560
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   561
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   562
    "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
   563
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   564
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   565
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   566
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   567
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   568
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   569
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   570
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   571
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   572
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   573
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   574
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   575
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   576
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   577
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   578
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   579
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   582
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   584
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   585
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   586
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   587
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   588
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   589
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   590
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   591
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   594
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   595
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   596
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   597
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   598
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   599
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   600
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   601
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   602
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   603
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   604
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   605
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   606
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   607
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   608
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   609
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   610
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   611
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   612
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   613
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   614
     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
   615
     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
   616
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   617
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   618
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   619
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   620
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   621
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   622
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   623
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   624
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   625
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   626
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   627
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   628
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   629
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   630
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   631
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   632
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   633
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   634
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   635
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   636
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   637
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   638
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   639
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   640
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   641
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   642
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   643
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   644
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   645
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   646
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   647
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   648
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   659
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   744
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   747
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   755
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   756
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   760
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   763
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   764
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   765
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   766
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   767
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   771
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   774
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   775
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   778
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   782
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   784
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   790
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   791
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   792
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   798
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   799
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   801
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   802
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
        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
   807
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   809
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   810
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   811
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   813
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
     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
   818
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   824
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   825
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   826
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   827
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   828
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   829
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   830
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   831
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   832
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   833
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   834
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   835
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   836
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   837
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   838
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   840
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   845
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   852
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   853
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   854
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   855
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   856
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   857
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   858
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   859
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   860
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   861
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   862
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   863
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   864
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   865
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   866
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   867
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   868
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   869
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   870
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   871
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   872
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   873
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   874
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   876
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   877
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   878
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   879
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   880
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   881
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   882
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   883
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   884
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   885
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   886
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   887
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   888
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   889
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   892
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   893
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   895
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   897
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   899
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   900
                defaultContents notNil ifTrue:[
3949
0514468a25e4 #BUGFIX
mawalch
parents: 3948
diff changeset
   901
                    s nextPutAll:defaultContents.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   902
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   905
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   906
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   914
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   916
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   939
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   943
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   945
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   949
    "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
   950
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   951
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   955
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   956
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   957
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   960
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   961
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   962
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   963
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   966
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   967
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   970
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   974
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   976
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   978
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   984
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   987
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
     if dir ~= nil, execute command in that directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
   991
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
    ^ self
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
   995
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   999
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
  1000
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1001
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1002
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1003
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1004
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1005
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1006
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1007
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1008
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1009
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
  1010
    "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
  1011
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1012
     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
  1013
     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
  1014
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1015
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1016
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1017
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1018
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1019
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1020
        pipe:false
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1021
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1022
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1023
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1024
    "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
  1025
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1026
    "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
  1027
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1028
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1029
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1030
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1031
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1032
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1033
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1034
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1035
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1036
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1037
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1038
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1039
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1040
        pipe:doPipe
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1041
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1042
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1043
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1044
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1045
    "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
  1046
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1047
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1048
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1049
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1050
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
  1051
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1052
     execute command in the dirArg directory (or the current directory if dirArg is nil).
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1053
     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
  1054
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1055
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1056
    |command cvsRoot rslt ok pathOfDir errorString|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1057
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1058
    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
  1059
        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
  1060
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1061
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1062
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1063
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1064
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1065
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1066
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1067
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1068
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1069
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1070
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1071
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1072
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1073
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1074
    "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
  1075
    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
  1076
        (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
  1077
            (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
  1078
                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
  1079
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1080
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1081
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1082
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1083
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1084
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1085
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1086
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1087
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1088
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1089
    doPipe ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1090
        rslt := PipeStream
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1091
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1092
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1093
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1094
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1095
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1096
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1097
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1098
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1099
            "/ execute the command in this thread, as opposed to the code below.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1100
            (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1101
                rslt := ok := OperatingSystem executeCommand:command
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1102
                                        inputFrom:nil
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1103
                                        outputTo:outStreamOrNil
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1104
                                        errorTo:errorStreamOrNil
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1105
                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1106
                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1107
                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1108
                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1109
            ] ifFalse:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1110
                rslt := ok := OperatingSystem
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1111
                                executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1112
                                errorTo:nil
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1113
                                inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1114
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1115
        ] ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1116
            CVSCommandSemaphore
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1117
                critical:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1118
                    |p errOut done|
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1119
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1120
                    errOut := WriteStream on:String new.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1121
                    p := [
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1122
                                (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1123
                                    rslt := ok := OperatingSystem executeCommand:command
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1124
                                                        inputFrom:nil
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1125
                                                        outputTo:outStreamOrNil
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1126
                                                        errorTo:errorStreamOrNil
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1127
                                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1128
                                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1129
                                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1130
                                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1131
                                ] ifFalse:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1132
                                    rslt := ok := OperatingSystem
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1133
                                                    executeCommand:command
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1134
                                                    outputTo:errOut
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1135
                                                    errorTo:errOut
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1136
                                                    inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1137
                                ]
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1138
                         ] fork.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1139
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1140
                    done := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1141
                    [done] whileFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1142
                        done := true.
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1143
                        (p waitUntilTerminatedWithTimeout:self cvsCommandTimeout asSeconds) ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1144
                            (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs
2696
b07662eb1f51 changed: #executeCVSCommand:module:inDirectory:log:pipe:
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1145
                                                    bindWith:self cvsCommandTimeout with:command)) ifTrue:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1146
                                done := false
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1147
                            ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1148
                                ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1149
                                p terminate.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1150
                                ok := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1151
                                errorString := 'CVS command timeout'.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1152
                            ]
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1153
                        ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1154
                            ok ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1155
                                errorString := errOut contents.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1156
                            ].
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1157
                        ]
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1158
                    ].
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1159
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1160
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1161
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1163
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1164
        self breakPoint:#cg.
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1165
        self breakPoint:#jv.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1166
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1167
            SourceCodeManagerError raiseRequestErrorString:(errorString ? 'CVS Error').
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1168
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1169
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1170
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1171
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1172
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1173
    "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
  1174
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1175
    "Created: / 28-02-2012 / 17:30:34 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1176
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1177
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1178
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1179
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1180
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1181
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1184
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1189
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1191
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1192
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1193
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1194
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1195
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1196
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1198
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1199
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1202
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1203
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1208
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1209
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1210
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1211
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1212
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1213
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1214
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1215
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1216
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1217
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1218
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1219
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1220
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1221
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1222
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1223
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1224
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1225
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1226
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1230
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1235
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1236
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1239
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1241
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1242
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1243
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1244
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1245
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1246
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1247
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1248
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1249
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1250
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1251
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1252
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1253
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1254
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1255
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1256
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1257
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1258
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1259
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1260
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1261
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1262
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1271
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
    ^ CVSModuleRoots ? #()
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
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1288
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1292
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1296
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1302
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1303
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1305
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1306
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1308
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1309
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1310
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1311
    "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
  1312
     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
  1313
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1314
     The returned information is a structure (IdentityDictionary)
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1315
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1316
              #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
  1317
              #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
  1318
              #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
  1319
              #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
  1320
              #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
  1321
              #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
  1322
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1323
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1324
    |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
  1325
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1326
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1327
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1328
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1329
    [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
  1330
        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
  1331
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1332
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1333
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1334
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1335
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1336
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1337
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1338
        record := IdentityDictionary new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1339
        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
  1340
        "/ decompose date/author/state etc.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1341
        (revLine2 asCollectionOfSubstringsSeparatedBy:$;) do:[:info |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1342
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1343
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1344
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1345
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1346
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1348
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1349
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1350
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1351
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1352
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1353
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1354
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1355
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1356
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1357
        "first revision does not hav a 'lines:' entry"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1358
        (record includesKey:#numberOfChangedLines) ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1359
            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
  1360
        ].
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
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1363
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1364
        [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
  1365
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1366
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1367
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1368
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1369
                    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
  1370
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1371
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1372
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1373
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1374
                    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
  1375
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1376
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1377
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1378
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1379
        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
  1380
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1381
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1382
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1383
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
    ].
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
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    "/
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
  1402
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
    "Modified: / 3.9.1999 / 14:51:29 / ps"
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
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1422
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1425
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1426
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1429
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1431
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1432
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1433
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1434
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1435
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1436
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1438
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1439
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1440
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1447
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1448
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1449
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1452
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1453
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1477
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1478
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1479
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1480
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1482
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1483
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1484
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1485
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1486
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1487
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1488
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1489
     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
  1490
     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
  1491
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1492
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
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
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1495
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1496
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1497
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1498
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1500
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1503
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1504
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1506
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1507
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
        (vsnString endsWith:'m') ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
             "/ alread a modified class
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1513
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1514
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1515
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1516
    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1517
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1518
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1520
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1521
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1522
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1523
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1524
    rightPart := rightPart copyFrom:idx+1.
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
    "/ originalVersionString:
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  1527
    "/      '$Header$'
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1528
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1529
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1530
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1531
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1532
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1533
    "/      'Exp $'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1534
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'. 
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1535
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart   
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1536
!
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1537
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1539
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1540
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1542
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1544
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1545
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1549
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1553
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1555
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
        (vsnString endsWith:'m') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1560
             "/ alread a modified class
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1563
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1564
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1565
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1566
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1567
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1568
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1571
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1572
    "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
  1573
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1574
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1575
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1576
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1577
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1578
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1579
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1580
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1581
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1582
2449
vrany
parents: 2403
diff changeset
  1583
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1584
vrany
parents: 2403
diff changeset
  1585
    "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
  1586
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1587
vrany
parents: 2403
diff changeset
  1588
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1589
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1590
vrany
parents: 2403
diff changeset
  1591
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1592
!
vrany
parents: 2403
diff changeset
  1593
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1594
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1595
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1596
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1597
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1598
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1599
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1600
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1601
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1602
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1603
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1604
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1605
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1606
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1607
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1608
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1609
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1610
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1611
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1612
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1613
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1614
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1615
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1616
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1617
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1618
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1619
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1620
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1621
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1622
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1623
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1624
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1625
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1626
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1627
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1628
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1629
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1630
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1631
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1632
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1633
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1634
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1635
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1636
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1637
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1638
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1639
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1640
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1641
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1642
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1643
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1644
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1645
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1646
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1647
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1648
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1649
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1650
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1651
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1652
    |tempdir cmd checkoutName logMsg revision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1653
     cmdOut whatHappened idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
     newRevision  msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1655
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1656
     editor checkInRepaired didAccept emphasizedText repairedText out
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1657
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1658
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1659
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
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 ...
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1675
        ^ self
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1676
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1677
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1678
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1679
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1681
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1682
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1683
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1684
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1685
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1686
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1687
        "/ to get up-to-date CVS entries, and also to be able to merge in
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1688
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1689
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1690
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1691
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1692
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1693
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1694
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1695
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1696
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1697
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1698
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1699
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1700
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1701
        "/ next, create CVS/Entries and CVS/Repository with version information of current version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1702
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1704
        "/ correct our current time, so that converting it will give us UTC
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1705
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1707
        self createEntryFor:checkoutName
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1708
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1709
             in:(tempdir construct:modulePath)
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1713
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1714
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1715
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1716
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1717
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1718
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1719
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1720
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1721
        ] do:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1722
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1723
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1724
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1725
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1726
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1727
        ].
3264
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
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1730
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1731
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  1732
        self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1733
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1734
        cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1735
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1736
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1737
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1739
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1744
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1749
            "/   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
  1750
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1751
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1752
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1753
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1754
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1755
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1756
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1758
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1759
            "/ no change
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1761
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1762
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
        ].
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
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1770
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1771
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1772
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1775
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1776
                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
  1777
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
            changeLog notNil ifTrue:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1779
                |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1780
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1781
                s := CharacterWriteStream new.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1783
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1784
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1786
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1788
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1791
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1792
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
        "/ we have to extract the one line which states what happened.
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
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1797
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1798
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1799
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1800
                            and:[(line startsWith:'Merging') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1801
                            and:[line size > 0]]]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1802
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1803
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1804
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1805
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1806
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1807
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1808
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1809
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1810
            or:[changeLog isNil
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1811
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1812
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1813
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1814
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1815
                Transcript showCR:'checking in ' , containerFilename , ' ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1816
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1817
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1818
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1819
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
                "/ 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
  1821
                "/ and version have been merged.
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
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1824
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1826
                mySource := someText.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1827
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1828
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1829
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1830
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1831
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1832
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1833
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1834
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1835
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1836
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1837
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1838
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1839
                                   abortable:false
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1840
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1841
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1842
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1843
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1844
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1845
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1846
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1847
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1848
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
  1849
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1850
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1851
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1852
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1853
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1854
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1855
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1856
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1858
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1859
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1860
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1861
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1862
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1863
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1865
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1866
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1867
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1868
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1869
                                label:'merged version'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1870
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1871
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1872
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1873
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1874
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1883
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1884
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1887
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1888
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1889
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1894
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1895
"/                ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1896
                Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1897
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1898
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1899
            (whatHappened startsWith:'C ') ifTrue:[
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
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1902
                "/ 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
  1903
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1904
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1905
                changesAsLogged := changesAsLogged asCollectionOfLines.
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
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1908
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1909
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1910
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1914
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1915
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1916
                     message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1917
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1918
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1919
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1920
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1921
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1922
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1926
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1927
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1928
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1929
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1930
                        label:'newest repository version'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
                answer == #option2 ifTrue:[
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
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1937
                    "/ this is error prone ...
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
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1940
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
                    "/ ... accept will check it in.
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
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1945
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1946
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1947
                                emphasizeMergedDiff3Text:emphasizedText
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1949
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1950
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1953
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1954
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1955
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1956
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1957
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1958
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1959
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1960
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1961
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1963
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1964
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1965
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1966
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1967
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1968
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1969
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1971
                        editor := RCSConflictEditTextView
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1972
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1973
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1974
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1976
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1977
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1980
                        editor topView openModal.
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 ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1983
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1984
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1985
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1986
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1987
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1988
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  1989
                            (repairedText findFirst:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ~~ 0 ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1990
                                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
  1991
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1992
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1993
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1994
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1995
                    ].
3264
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
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1998
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1999
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2000
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2001
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2002
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2003
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2004
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2005
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2006
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2007
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2008
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2009
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2010
                checkInRepaired ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2011
                    Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2012
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2013
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2014
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2015
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2016
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2017
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2019
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2020
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2021
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2022
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2023
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2024
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2025
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2026
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2027
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2028
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2029
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2030
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2031
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2032
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2033
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2034
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2035
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2036
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2037
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2038
            ]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2039
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2040
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2041
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
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2044
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2045
        self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2046
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2047
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2048
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2049
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2050
            "/ save the log message into another tempFile ...
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2051
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2052
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2054
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2055
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
            s close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2057
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2058
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2059
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2060
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2064
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2066
            "/ CVS V1.9.16 to stdout.
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
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2069
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2070
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2071
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2072
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2073
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2075
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2076
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2077
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2078
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2079
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2080
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2081
                whatHappened := cmdOut contentsOfEntireFile asString.
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
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2084
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2085
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2086
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2087
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2088
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2089
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2090
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2091
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2092
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2093
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2096
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
            whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2099
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2100
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2101
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2102
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2104
        "/ fetch the new revision nr as found in the commit commands output
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
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2108
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2109
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2110
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2111
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2112
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2113
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2114
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2115
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2116
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2117
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2118
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2119
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2120
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2121
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2122
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2124
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2125
    "Modified: / 12-11-2010 / 11:04:10 / cg"
2823
70f154c6ee66 changed: #checkin:text:directory:module:logMessage:force:
sr
parents: 2822
diff changeset
  2126
    "Modified: / 19-04-2012 / 14:18:24 / sr"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2127
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2128
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2129
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2130
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2131
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2135
    |tempdir cmd checkoutName logMsg revision newestRevision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2136
     cmdOut whatHappened s entry idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2137
     newRevision newString binRevision className msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2138
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2139
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2140
     emSep comment force conflictResolvedManually revisionOption|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2141
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2142
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2145
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2146
        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
  2147
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2148
    ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2149
    revision := "cls revision" cls revisionOfManager:self.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2150
    (revision notNil and:[revision endsWith:$m])
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2153
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2154
        "/ must use the original revision string.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2155
        revision := revision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
        revision ~= binRevision ifTrue:[
3317
ca815e9ab789 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3295
diff changeset
  2159
            Transcript showCR:('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?'))
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2160
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2161
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2163
    revision isNil ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2164
        revision := newestRevision := self newestRevisionOf:cls.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2165
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2166
            force ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2167
                revision := newestRevision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
1906
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2168
                revision isNil ifTrue:[
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2169
                    revision := '1.0'   "/ initial checkin
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2170
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2171
            ] ifFalse:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2172
                revision := '1.0'   "/ initial checkin
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2173
            ]
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2174
        ] ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2175
            revision == #deleted ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2176
                revision := '0'     "/ to force cvs-adding, which resurrects the file from the Attic
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2177
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2178
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2179
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2181
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2182
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2183
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2184
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2185
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2186
            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
  2187
            ^ false.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2188
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2195
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2197
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2198
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2199
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2200
    "/
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
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2204
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2205
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2206
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2207
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2208
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2209
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2210
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2211
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2212
        "/ next, create CVS/Entries and CVS/Repository with version information of current version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2213
        "/
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2214
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2215
            modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2216
        ] ifFalse:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2217
            modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2218
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2219
        checkoutName :=  modulePath , '/' , classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2220
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2221
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2222
        "/ correct our current time, so that converting it will give us UTC
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2223
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2224
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2225
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2226
        self createEntryFor:checkoutName
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2227
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2228
             in:(tempdir construct:modulePath)
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2229
             revision:revision
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2230
             date:(self cvsTimeString:time)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2231
             special:''
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2232
             overwrite:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2233
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2234
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2235
        "/ copy-over our current version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2236
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2237
        Error handle:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2238
            self reportError:'cannot copy-over filedOut class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2239
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2240
        ] do:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2241
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2242
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2243
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2244
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2245
        "/ synchronize i.e. merge in any changes
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2246
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2247
        self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2248
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2249
        revisionOption := ''.
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2250
        (revision asCollectionOfSubstringsSeparatedBy:$.) size > 2 ifTrue:[
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2251
            "must be a branch, compare with branch revision"
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2252
            revisionOption := '-r ', revision copyUpToLast:$..
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2253
        ].
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2254
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2255
        cmd := 'update %1 %4 %2 >"%3"'
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2256
            bindWith:CVSUpdateOptions
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2257
            with:classFileName
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2258
            with:cmdOut name
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2259
            with:revisionOption.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2260
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2261
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2262
            executeCVSCommand:cmd
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2263
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2264
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2265
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2266
            force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2267
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2268
                    "/ no container
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2269
                    "/ someone fiddled around with repository ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2270
                    (cls binaryRevision notNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2271
                        (Dialog confirm:('Someone seems to have removed the source container for ',cls name,'\\Force new checkin ?') withCRs)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2272
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2273
                            cls setBinaryRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2274
                            ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2275
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2276
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2277
                    (Dialog confirm:('There seems to be no source container for "%1"\(Either the source container was removed,\or your per-module repository setting is wrong,\or the CVS server is unreachable).\\Proceed?' bindWith:cls name allBold) withCRs)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2278
                    ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2279
                        ^ false
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2280
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2281
                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2282
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2283
                "/ is the version correct ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2284
                newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2285
                    newestRevision := self newestRevisionOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2286
                    newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2287
                        (Dialog confirm:('The source container for ',cls name allBold,' seems corrupted. Proceed?' withCRs)) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2288
                            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2289
                        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2290
                        ^ self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2291
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2292
                            source:sourceFileName logMessage:logMessage force:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2293
                    ].
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2294
                ].
2483
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2295
"/            revision > newestRevision ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2296
"/                true "/ (Dialog confirm:('The version-info of ',cls name allBold,' is wrong \(The class version (',revision allBold,') is newer than the newest version in the repository (',newestRevision allBold,').\\Patch the version and retry checkin ?') withCRs)
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2297
"/                ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2298
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2299
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2300
"/                    ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2301
"/                ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2302
"/            ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2303
"/
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2304
"/            self reportError:('cannot merge current source with repository version (failed to execute: ',cmd,')').
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2305
"/            ^ false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2306
                "/ if we arrive here, proceed as if merged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2307
                whatHappened := 'M initial'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2308
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2309
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2310
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2311
            "/ check what happened - the contents of the cmdOut file may be:
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2312
            "/   empty   -> nothing changed
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2313
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2314
            "/   C xxx   -> a conflict occurred and the differences have been merged into the source
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2315
            "/              needs special action
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2316
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2317
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  2318
                whatHappened := cmdOut contentsAsString.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2319
            ] ifFalse:[
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2320
                self breakPoint:#cg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2321
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2322
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2323
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2324
        (whatHappened isEmptyOrNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2325
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2326
            "/ no change
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2327
            "/
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2328
        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2329
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2330
            force ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2331
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2332
"/                (self confirm:('Nothing changed in %1 (repository unchanged).\\Remove entries from changeSet ?' bindWith:className) withCRs) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2333
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2334
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2335
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  2336
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2337
"/            ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2338
                self postCheckInClass:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2339
            ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2340
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2341
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2342
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2343
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  2344
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2345
                    entry := (changeLog at:#revisions) first.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2346
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2347
                    newString isEmptyOrNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2348
                        'CVSSourceCodeManager [error]: missng revisionString' errorPrintCR
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2349
                    ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2350
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2351
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2352
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2353
                        ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2354
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2355
                        ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2356
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2357
                ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2358
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2359
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2360
            ^ true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2361
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2362
        Verbose == true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2363
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2364
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2365
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2366
        force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2367
            revision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2368
                changeLog := self revisionLogOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2369
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2370
                changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2371
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2372
            changeLog notNil ifTrue:[
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2373
                s := CharacterWriteStream on:String new.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2374
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2375
                changesAsLogged := s contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2376
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2377
                "/ mhmh - that should not happen
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2378
                changesAsLogged := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2379
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2380
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2381
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2382
        didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2383
        conflictResolvedManually := checkInRepaired := checkInNew := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2384
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2385
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2386
        "/ cvs above rel10 returns a multiline info ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2387
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2388
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2389
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2390
        whatHappened := whatHappened select:[:line |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2391
                            (line startsWith:'RCS file') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2392
                            and:[(line startsWith:'retrieving') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2393
                            and:[(line startsWith:'Merging') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2394
                            and:[line size > 0]]]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2395
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2396
        whatHappened := whatHappened asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2397
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2398
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2399
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2400
            "/ merged in changes / resurrected
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2401
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2402
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2403
            or:[changeLog isNil
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2404
            or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2405
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2406
                "/ pretty good - nothing has changed in the meanwhile
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2407
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2408
                Transcript showCR:('checking in %1 (%2)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2409
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2410
                |mySource mergedSource |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2411
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2412
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2413
                "/ someone else has changed things in the meanwhile, but there is no conflict
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2414
                "/ and version have been merged.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2415
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2416
                didMerge := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2417
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2418
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2419
                s := CharacterWriteStream new.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2420
                self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2421
                mySource := s contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2422
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2423
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2424
                mySource = mergedSource ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2425
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2426
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2427
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2428
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2429
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2430
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2431
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2432
                                   message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2433
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2434
                                   abortable:false
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2435
                                   option:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2436
                    didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2437
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2438
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2439
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2440
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2441
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2442
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2443
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
  2444
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2445
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2446
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2447
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2448
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2449
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2450
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2451
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2452
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2453
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2454
                                   message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2455
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2456
                                   abortable:true
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2457
                                   option:'Stop - see first'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2458
                                   option2:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2459
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2460
                    answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2461
                        (Dialog confirm:'Are you certain that you want to suppress a merge and force your code to be checked in ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2462
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2463
                            s := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2464
                            self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2465
                            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2466
                            answer := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2467
                        ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2468
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2469
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2470
                    answer ~~ true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2471
                        answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2472
                            DiffCodeView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2473
                                openOn:mySource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2474
                                label:'current version'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2475
                                and:mergedSource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2476
                                label:'merged version'.
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2477
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2478
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2479
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2480
                        ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2481
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2482
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2483
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2484
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2485
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2486
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2490
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2491
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2492
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2494
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2495
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2496
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2497
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2498
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2499
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2500
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2501
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2502
"/                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2503
                Transcript showCR:('checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2504
            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2505
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2506
            (whatHappened startsWith:'C ') ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2507
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2508
                "/ conflict; someone else checked in something in the meanwhile,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2509
                "/ and there is a conflict between this version and the checked in version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2510
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2511
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2512
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2513
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2514
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2515
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2516
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2517
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2518
You should fix things by comparing your class with the most recent repository version
2014
9e548ccb1c5e Fix typo in user info text
Stefan Vogel <sv@exept.de>
parents: 2011
diff changeset
  2519
and change your methods avoiding conflicts. Then checkin again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2520
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2521
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2522
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2523
                     message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2524
                     log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2525
                     abortable:false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2526
                     option:'Show conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2527
                     option2:'Resolve conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2528
                     option3:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2529
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2530
                answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2531
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2532
                    "/ show conflicts in a 3-way DiffTextView ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2533
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2534
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2535
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2536
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2537
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2538
                        label:'newest repository version'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2539
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2540
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2541
                answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2542
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2543
                    "/ allow checkin of repair version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2544
                    "/ this is error prone ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2545
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2546
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2547
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2548
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2549
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2550
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2551
                    emSep := (Array with:(#color->Color black)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2552
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2553
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2554
                                emphasizeMergedDiff3Text:emphasizedText
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2555
                                emphasize1:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2556
                                                  with:(#backgroundColor->Color blue))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2557
                                emphasize2:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2558
                                                  with:(#backgroundColor->Color red))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2559
                                emphasizeSep:emSep.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2560
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2561
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2563
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2564
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2565
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2566
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2567
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2568
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2569
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2570
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2571
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2572
'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2573
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2574
                    emphasizedText := comment , emphasizedText.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2575
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2576
                    didAccept := false. checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2577
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2578
                        editor := RCSConflictEditTextView
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2579
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2580
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2581
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2582
                        editor acceptAction:[:dummy |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2583
                            repairedText := editor list.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2584
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2585
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2586
                        didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2587
                        editor topView openModal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2588
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2589
                        didAccept ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2590
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2591
                            ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2592
                                checkInRepaired := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2593
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2594
                        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2595
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  2596
                            (repairedText findFirst:[:line | line notEmptyOrNil and:[(line emphasisAt:1) = emSep]]) ~~ 0 ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2597
                                self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2598
                                didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2599
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2600
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2601
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2602
                    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2603
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2604
                    checkInRepaired ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2605
                        [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2606
                            out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2607
                            out nextPutAll:(repairedText asString string).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2608
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2609
                            out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2610
                        ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2611
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2612
                            checkInRepaired := false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2613
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2614
                    ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2615
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2616
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2617
                answer == #option3 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2618
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2619
                    "/ force checkin of new version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2620
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2621
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2622
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2623
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2624
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2625
                    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2626
                        out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2627
                        self fileOutSourceCodeOf: cls on:out.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2628
                        out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2629
                        didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2630
                        checkInNew := checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2631
                    ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2632
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2633
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2634
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2635
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2636
                checkInRepaired ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2637
                    checkInNew ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2638
                        Transcript showCR:('checking in %1 (%2) (force)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2639
                    ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2640
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2641
                        Transcript showCR:('checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2642
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2643
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2644
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2645
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2646
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2647
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2648
            ] ifFalse:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2649
                ((whatHappened startsWith:'U ')
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2650
                or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2651
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2652
                    "/ nothing changed here, but the repository already contains
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2653
                    "/ a newer version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2654
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2655
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2656
                    self information:'nothing changed in your ''' , className , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2657
but repository already contains a newer version (repository unchanged).'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2658
                    ^ true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2659
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2660
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2661
                    "/ unexpected
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2662
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2663
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2664
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2665
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2666
No checkin performed.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2667
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2668
                    ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2669
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2670
            ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2671
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2672
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2673
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2674
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2675
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2676
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2677
        self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2678
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2679
        logMsg := logMsg replChar:$"  withString:'\"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2680
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2681
        OperatingSystem isUNIXlike ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2682
            "/ save the log message into another tempFile ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2683
            logTmp := Filename newTemporaryIn:tempdir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2684
            s := logTmp writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2685
            s nextPutAll:logMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2686
            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2687
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2688
            cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2689
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2690
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2691
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2692
            "/ CVS V1.9.16 to stdout.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2693
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2694
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2695
        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2696
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2697
            executeCVSCommand:cmd
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2698
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2699
            inDirectory:tempdir name
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2700
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2701
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2702
                whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2703
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2704
                whatHappened := '<< no message >>'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2705
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2706
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2708
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2709
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2710
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2711
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2712
            logTmp notNil ifTrue:[logTmp remove].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2713
            self reportError:'cannot checkin modified class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2714
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2715
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2716
        logTmp notNil ifTrue:[logTmp remove].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2717
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2718
            whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2719
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2720
            whatHappened := nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2721
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2722
    ] ensure:[
3817
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2723
        OperatingSystem accessDeniedErrorSignal handle:[:ex |
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2724
            Dialog warn:('Warning: some problem encountered when trying to remove a temporary workfile:\\%1\\The checkin was successful, though.\Please remove those temporary files later.' withCRs
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2725
                        bindWith:ex description).
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2726
            ex proceed.
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2727
        ] do:[
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2728
            tempdir notNil ifTrue:[ tempdir recursiveRemove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2729
            cmdOut notNil ifTrue:[ cmdOut remove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2730
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2731
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2732
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2733
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2734
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2735
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2736
    (whatHappened isEmptyOrNil) ifTrue:[
3112
5ccec8607540 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3106
diff changeset
  2737
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2738
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2739
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2740
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2741
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2742
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2743
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2744
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2745
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2746
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2747
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2749
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2750
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2751
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2753
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2754
    "/   (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
  2755
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2756
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2757
    "/ if there was a merge (i.e. the repository now contains a merge of the current and some
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2758
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2759
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2760
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2761
    "/    If we later checkin again, the new checkin will be again based on the current revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2762
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2763
    newRevision notNil ifTrue:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2764
        (didMerge or:[conflictResolvedManually]) ifFalse:[
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2765
            "/ new code:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2766
            cls revisionString notEmptyOrNil ifTrue:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2767
                newRevision isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2768
                    'CVSSourceCodeManager [error]: got no valid revisionString (class checked in, but no valid revision returned)' errorPrintCR
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
  2769
                ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2770
                    newString := self updatedRevisionStringOf:cls forRevision:newRevision andUser:OperatingSystem getLoginName with:cls revisionString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2771
                    newString isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2772
                        'CVSSourceCodeManager [error]: failed to update revisionString (class checked in, but no revision method)' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2773
                    ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2774
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2775
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2776
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2777
                        ].
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
  2778
                    ].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2779
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2780
                self activityNotification:'Done.'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2781
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2782
                self activityNotification:'CVS: Fetch new revision number of ', cls name.
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2783
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2784
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2785
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2786
                    force ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2787
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2788
                    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2789
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2790
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2791
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2792
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2793
                ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2794
                    entry := (changeLog at:#revisions) first.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2795
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2796
                    self updateVersionMethodOf:cls for:newString.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2797
                    cls revision ~= newRevision ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2798
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2799
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2800
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2801
            ]
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2802
        ] ifTrue:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2803
            "/ If the conflict was resolved manually, do NOT update the revision method
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2804
            "/ (to get a new conflict in the next check-in)
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2805
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2806
            "/ If there was a merge, update the revision method adding an 'm'"
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2807
            didMerge ifTrue: [
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2808
                newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
2403
7290a8be819d changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2401
diff changeset
  2809
                newString notNil ifTrue:[ self updateVersionMethodOf:cls for:newString ].
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2810
            ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2811
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2812
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2813
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2814
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2815
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2816
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2817
    conflictResolvedManually ifTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2818
        (Dialog
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2819
            confirm:'Now the repository contains a merge between your and the other changes.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2820
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2821
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2822
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2823
2604
e0743b3ba275 message text only
Claus Gittinger <cg@exept.de>
parents: 2601
diff changeset
  2824
I recommend doing this as soon as possible via your browser''s checkout function.'
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2825
            title:'Code Merged'
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2826
            yesLabel:'OK' noLabel:'Update (Load Merged Code)'
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2827
        ) ifFalse:[
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2828
            self utilities
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2829
                checkoutClass:cls
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2830
                askForRevision:false
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2831
                askForMerge:false
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2832
                askForConfirmation:false.
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2833
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2834
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2835
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2836
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2837
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2841
    "Created: / 11-09-1996 / 16:16:11 / cg"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2842
    "Modified: / 26-02-1998 / 17:34:16 / stefan"
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2843
    "Modified: / 31-07-2013 / 18:07:53 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2844
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2845
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2846
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2847
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2848
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2849
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2850
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2851
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2852
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2853
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2854
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2855
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2856
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2857
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2858
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2859
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2860
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2861
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2862
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2863
    self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2864
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2865
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2866
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2867
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2868
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2869
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2870
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2871
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2872
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2873
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2874
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2875
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2876
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2877
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2878
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2879
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2880
            inDirectory:tempdir name.
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
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2883
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2884
            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
  2885
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2886
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2887
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2888
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2891
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2892
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2893
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2894
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2895
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2896
    "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
  2897
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2898
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2899
3866
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2900
getSourceStreamFor:aClass revision:aRevisionStringOrNil
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2901
    "extract a classes source code and return an open readStream on it.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2902
     A revision of nil selects the current (in image) revision.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2903
     The classes source code is extracted using the revision and the sourceCodeInfo,
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2904
     which itself is extracted from the classes packageString."
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2905
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2906
    |cacheIt|
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2907
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2908
    "/ never cache symbolic versions
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2909
    cacheIt := (aRevisionStringOrNil isNil or:[ aRevisionStringOrNil first isDigit ]).
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2910
    ^ self getSourceStreamFor:aClass revision:aRevisionStringOrNil cache:cacheIt
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2911
!
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2912
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2913
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2914
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2915
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2916
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2921
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2923
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2924
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2925
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2928
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2929
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2930
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2932
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2934
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2936
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2938
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2939
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2940
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2941
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2942
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2943
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2945
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
    ].
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2948
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2949
        fullName := moduleDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2950
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2951
        fullName := moduleDir , '/' , packageDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2952
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2953
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2954
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2955
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2956
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2957
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2958
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2959
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2960
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2961
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2962
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2963
    "/ 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
  2964
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2965
    "/ 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
  2966
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2967
    "/ (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
  2968
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2969
   (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
  2970
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2971
            ('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
  2972
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2973
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2974
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2975
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2976
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2977
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2978
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2979
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2980
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2981
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2982
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2983
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2984
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2985
    "/ 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
  2986
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2987
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2988
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2989
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2990
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2991
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2992
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2993
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2994
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2999
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3000
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3001
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3002
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3003
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3004
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3005
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3006
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3007
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3008
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3009
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3010
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3011
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3012
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3013
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3014
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3015
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3016
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3017
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3018
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3019
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3020
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3021
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3022
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3023
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3024
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3025
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3026
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3027
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3028
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3029
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3030
        self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3031
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3032
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3033
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3034
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3035
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3036
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3037
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3038
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3039
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3040
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3041
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3042
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3043
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3044
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3045
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3046
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3047
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3048
"/        "/ 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
  3049
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3050
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3051
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3052
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3053
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3054
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3055
"/            ('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
  3056
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3057
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3058
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3059
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3060
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3061
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3062
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3063
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3064
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3065
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3066
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3067
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3068
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3069
            ('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
  3070
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3071
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3072
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3073
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3074
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3075
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3076
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3077
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3078
                fullTempName moveTo:fullCachedName.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3079
                self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3080
            ]) ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3081
                self activityNotification:'CVS: Not cached.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3082
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3083
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3084
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3085
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3086
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3087
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3088
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3089
            fileName = 'extensions.st' ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3090
                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
  3091
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3092
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3093
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3094
                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
  3095
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3096
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3097
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3098
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3099
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3100
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3101
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3102
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3103
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3104
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3105
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3106
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3107
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3108
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3109
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3110
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3111
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3112
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3113
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3114
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3115
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3116
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3117
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3118
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3119
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3120
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3121
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3122
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3123
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3124
    "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
  3125
    "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
  3126
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3127
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3128
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3129
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3130
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3131
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3132
    "return info about who changed what and when.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3133
     Return nil on failure.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3134
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3135
     The returned information is a structure entry for each line
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3136
            #revision           -> version of last change
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3137
            #author             -> author 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3138
            #date               -> change date 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3139
        "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3140
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3141
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3142
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3143
    tempDir := self createTempDirectory:nil forModule:nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3144
    tempDir isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3145
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3146
        ^ nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3147
    ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3148
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3149
    [
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3150
        |cmd revArg|
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3151
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3152
        modulePath :=  moduleDir , '/' , packageDir. 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3153
        fullName :=  modulePath , '/' , classFileName.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3154
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3155
        self createEntryFor:fullName 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3156
             module:moduleDir
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3157
             in:(tempDir construct:modulePath) 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3158
             revision:'1.1' 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3159
             date:'dummy' 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3160
             special:''
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3161
             overwrite:false.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3162
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3163
        msg := 'Fetching annotation log '.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3164
        clsOrNil isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3165
            msg := msg , 'in ' , fullName.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3166
        ] ifFalse:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3167
            msg := msg , 'of ', clsOrNil name.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3168
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3169
        self activityNotification:msg,'...'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3170
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3171
        inStream := self 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3172
                        executeCVSCommand:('annotate ' , fullName) 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3173
                        module:moduleDir 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3174
                        inDirectory:tempDir 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3175
                        log:true 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3176
                        pipe:true.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3177
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3178
        inStream isNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3179
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3180
            ^ nil
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3181
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3182
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3183
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3184
        "/ read the commands pipe output and extract the info
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3185
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3186
        info := IdentityDictionary new.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3187
        inHeaderInfo := true.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3188
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3189
            line:= inStream nextLine.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3190
            ((line ? '') startsWith:'*******') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3191
                inHeaderInfo := false.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3192
            ]
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3193
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3194
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3195
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3196
        "/ continue to read the commands pipe output 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3197
        "/ and extract change info records
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3198
        "/
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3199
        [inStream atEnd] whileFalse:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3200
            line := inStream nextLine.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3201
Transcript showCR:line.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3202
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3203
    ] ensure:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3204
        inStream notNil ifTrue:[inStream close].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3205
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3206
        tempDir notNil ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3207
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3208
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3209
            ] do:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3210
                tempDir recursiveRemove
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3211
            ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3212
        ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3213
        self activityNotification:nil.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3214
    ].
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3215
    ^ info
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3216
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3217
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3218
     SourceCodeManager 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3219
        annotationsFor:Array 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3220
        fileName:'Array.st' directory:'libbasic' module:'stx'
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3221
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3222
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3223
     SourceCodeManager 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3224
        annotationsFor:MenuPanel 
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3225
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3226
    "
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3227
!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3228
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3229
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3230
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3232
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3233
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3234
    cvsRoot := self getCVSROOTForModule:moduleDir.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3235
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3236
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3237
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3238
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3239
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3241
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3242
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3243
    ] ifFalse:[ 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3244
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3245
    ].
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3246
    
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3247
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3248
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3249
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3250
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3251
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3252
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3253
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3254
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3255
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3256
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3257
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3258
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3259
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3260
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3262
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3263
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3266
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3267
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3268
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3269
    "/ 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
  3270
    "/ (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
  3271
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3272
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3273
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3274
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3275
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3276
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3277
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
                    executeCVSCommand:cmd , fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
                    module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3282
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3283
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
                    inDirectory:(tempDir pathName) 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3285
                    log:false
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3286
                    outputTo:outputStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3287
                    errorTo:errorStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3288
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3289
        "cannot check for exit status starting at cvs 1.11.5, because an exit status 0
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3290
         is returned even if the file does not exist"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3291
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3292
        "But: if there is any output, the command failed and the container does not exist"
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3293
        "/ cg: read comment above.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3294
        ret2 := errorStream size == 0.
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3295
        ret2 ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3296
            ret2 := (errorStream contents asCollectionOfLines 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3297
                        reject:[:l | l isBlank or:[(l includesString:'WARNING:')] ]) size == 0 
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3298
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3299
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3300
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3302
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3304
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3305
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3306
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3307
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3308
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3309
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3310
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3311
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3312
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3313
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3314
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3315
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3316
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3317
    "Created: / 13-09-2006 / 18:20:36 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3318
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3319
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3320
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3321
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3322
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3323
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3324
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3325
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3326
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3327
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3328
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3329
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3331
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3332
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3333
    self activityNotification:'CVS: Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3334
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3335
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3338
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3339
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3340
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3341
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3342
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3343
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3344
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3345
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3346
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3347
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3348
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3349
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3350
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3351
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3352
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3353
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3354
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3355
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3356
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3357
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3358
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3359
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3360
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3361
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3362
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3363
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3364
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3365
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3366
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3367
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3368
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3369
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3370
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3371
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3372
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3373
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3375
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3376
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3377
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3378
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3379
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3382
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3384
    "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
  3385
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3386
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3387
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3388
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3389
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3392
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3393
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3394
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3395
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3396
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3397
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3398
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3399
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3400
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3401
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3402
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3404
    self activityNotification:'CVS: Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3406
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3407
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3408
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3409
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3410
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3411
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3412
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3413
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3414
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3415
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3416
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3417
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3418
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3419
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3420
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3421
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3422
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3423
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3424
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3425
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3426
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3427
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3428
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3429
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3430
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3431
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3432
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3433
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3434
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3435
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3436
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3437
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3438
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3442
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3443
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3445
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3446
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3453
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3454
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3457
    "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
  3458
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3468
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3469
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3470
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3471
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3478
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3479
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3480
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3481
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3482
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3490
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3494
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3515
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3528
    self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3555
    self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3579
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3605
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3631
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
            ]
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
    "/ (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
  3644
    "/  correctly for all unchanged methodss)
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
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3661
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3672
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3673
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3674
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3689
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3690
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3691
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3692
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3693
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3701
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3731
        self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3734
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3741
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3754
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3755
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3756
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3757
        self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&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
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3781
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3794
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3795
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3796
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3797
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3798
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3799
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3806
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3808
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3809
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3836
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3837
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3838
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3841
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3842
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3843
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3844
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3850
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3856
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3857
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3858
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3859
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3863
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
    "/ then import it into CVS
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
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3883
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3884
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3885
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3890
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3893
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3894
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3895
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3896
    "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
  3897
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3898
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3901
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3905
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3906
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3907
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3908
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3909
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3910
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3911
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
        ].
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
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3918
        ('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
  3919
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3924
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3933
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3934
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3935
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3936
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3937
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3938
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3939
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3942
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3943
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3944
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3946
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3947
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3948
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3949
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3950
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3951
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3952
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3953
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3954
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3955
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3956
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3957
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3958
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3959
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3960
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3961
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3962
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3963
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3965
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3966
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3967
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3968
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3969
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3970
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3971
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3972
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3973
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3974
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3975
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3976
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3977
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3978
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3979
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3980
    "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
  3981
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3982
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3983
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3984
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3985
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
  3986
    "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
  3987
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3988
    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
  3989
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3990
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3991
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3992
        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
  3993
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3994
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3995
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  3996
diffListFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir revision1:rev1 revision2:rev2
3323
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3997
    "return diff info. This is supposed to return a standard diff-like
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3998
     list of lines, representing the diffs between two revisions.
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  3999
     experimental (for ownershipGraph)"
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4000
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4001
    ^  self
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4002
        diffListFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4003
        cache:true
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4004
!
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4005
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4006
diffListFor:clsOrNil fileName:classFileNameArg directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 cache:cacheIt
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4007
    "return diff info. This is supposed to return a standard diff-like
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4008
     list of lines, representing the diffs between two revisions.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4009
     experimental (for ownershipGraph)"
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4010
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4011
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName|
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4012
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4013
    clsOrNil notNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4014
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4015
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4016
    ] ifFalse:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4017
        modulePath :=  moduleDir , '/' , packageDir. 
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4018
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4019
    ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4020
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4021
   (cacheIt) ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4022
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4023
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4024
        ] ifFalse:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4025
            (cacheDir / modulePath / '.diffs') exists ifFalse:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4026
                (cacheDir / modulePath / '.diffs') makeDirectory.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4027
            ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4028
            cachedFile := cacheDir / modulePath / '.diffs' / (classFileName,'_',rev1,'_',rev2).
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4029
            cachedFile exists ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4030
                ^ cachedFile contents
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4031
            ].
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4032
        ].
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4033
    ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4034
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4035
    tempDir := self createTempDirectory:nil forModule:nil.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4036
    tempDir isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4037
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4038
        ^ nil.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4039
    ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4040
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4041
    [
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4042
        self createEntryFor:fullName 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4043
             module:moduleDir
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4044
             in:(tempDir construct:modulePath) 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4045
             revision:'1.1' 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4046
             date:'dummy' 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4047
             special:''
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4048
             overwrite:false.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4049
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4050
        msg := 'CVS: Fetching diff list of '.
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4051
        clsOrNil isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4052
            msg := msg , fullName.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4053
        ] ifFalse:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4054
            msg := msg , clsOrNil name.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4055
        ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4056
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4057
        self activityNotification:msg.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4058
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4059
        inStream := self 
3369
0e42f9543608 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3363
diff changeset
  4060
                        executeCVSCommand:('diff -w -r%1 -r%2 %3' bindWith:rev1 with:rev2 with:fullName) 
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4061
                        module:moduleDir 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4062
                        inDirectory:tempDir 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4063
                        log:true 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4064
                        pipe:true.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4065
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4066
        inStream isNil ifTrue:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4067
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4068
            ^ nil
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4069
        ].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4070
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4071
        "/
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4072
        "/ read the commands pipe output and extract the container info
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4073
        "/
3336
f813960e3a01 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3333
diff changeset
  4074
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4075
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4076
        list := inStream contents.
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4077
    ] ensure:[
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4078
        inStream notNil ifTrue:[inStream close].
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4079
        tempDir recursiveRemove
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4080
    ].
3323
2fa2a06e361d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3322
diff changeset
  4081
    list := list reject:[:line | line startsWith:'\ '].
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4082
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4083
    cachedFile notNil ifTrue:[
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4084
        cachedFile contents:list.
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  4085
    ].
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4086
    ^ list
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4087
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4088
    "
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4089
     SourceCodeManager statusOf:Array 
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4090
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4091
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4092
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4093
    "
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4094
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4095
    "Modified: / 29-08-2006 / 13:18:00 / cg"
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4096
!
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  4097
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4098
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
  4099
    "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
  4100
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4101
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4102
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4103
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4104
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4105
     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
  4106
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4107
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4108
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4109
    "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
  4110
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4111
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4112
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4113
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4114
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4115
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4116
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4117
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4118
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4119
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4120
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4121
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4122
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4123
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4124
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4125
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4126
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4127
    "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
  4128
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4129
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4131
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4132
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4133
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4134
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4135
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4136
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4137
    "return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4138
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4139
    |cvsRoot fullName|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4140
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4141
    cvsRoot := self getCVSROOTForModule:moduleDir.
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  4142
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4143
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4144
        fullName := (cvsRoot , '/' , moduleDir)
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4145
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4146
        fullName := (cvsRoot , '/' , moduleDir , '/' , packageDir)
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4147
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4148
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4149
        initialRCSRevisionStringFor:aClass 
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4150
        in:fullName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4151
        container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4152
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  4153
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  4154
    "Created: / 23-08-2006 / 14:05:46 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4155
!
Claus Gittinger <cg@exept.de>
parents: 1361
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
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4158
    "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
  4159
     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
  4160
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4161
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4162
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4163
    self activityNotification:'CVS: Fetching list of directories...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4164
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4165
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4166
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4167
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4168
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4169
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4170
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4171
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4172
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4173
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4174
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4175
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4176
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4177
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4178
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4179
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4180
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4181
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4182
    |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
  4183
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4184
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4185
    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
  4186
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4187
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4188
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4189
                        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
  4190
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4191
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4192
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4193
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4194
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4195
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4196
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4197
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4198
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4199
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4200
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4201
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4202
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4203
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4204
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4205
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4206
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4207
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4208
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4209
                "/ '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
  4210
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4211
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4212
                    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
  4213
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4214
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4215
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4216
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4217
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4218
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4219
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4220
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4221
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4222
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4223
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4224
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4225
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4226
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4227
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4228
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4229
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4230
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4231
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4232
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4233
     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
  4234
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4235
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4236
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4237
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4238
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4239
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4240
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4241
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4242
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4243
    self activityNotification:'CVS: Fetching list of containers...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4244
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4245
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4246
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4247
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4248
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4249
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4250
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4251
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4252
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4253
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4254
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4255
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4256
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4257
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4258
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4259
    "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
  4260
     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
  4261
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4262
    |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
  4263
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4264
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4265
         "/ 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
  4266
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4267
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4268
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4269
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4270
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4271
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4272
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4273
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4274
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4275
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4276
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4277
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4278
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4279
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4280
        modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4281
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4282
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4283
    ].        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4284
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4285
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4286
    [
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4287
        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
  4288
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4289
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4290
                        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
  4291
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4292
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4293
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4294
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4295
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4296
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4297
            ('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
  4298
            "/ 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
  4299
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4300
                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
  4301
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4302
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4303
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4304
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4305
            "/ 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
  4306
            "/ 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
  4307
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4308
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4309
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4310
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4311
                log:true 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4312
                outputTo:(WriteStream on:String new) errorTo:(WriteStream on:String new).
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4313
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4314
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4315
            "/ 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
  4316
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4317
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4318
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4319
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4320
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4321
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4322
                        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
  4323
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4324
                            (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
  4325
                                "/ 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
  4326
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4327
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4328
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4329
                        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
  4330
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4331
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4332
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4333
                                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
  4334
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4335
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4336
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4337
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4338
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4339
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4340
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4341
        ('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
  4342
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4343
        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
  4344
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4345
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4346
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4347
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4348
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4349
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4350
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4351
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4352
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4353
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4354
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4355
    "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
  4356
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4357
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4358
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4359
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4360
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4361
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4362
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4363
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4364
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4365
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4366
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4367
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4368
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4369
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4370
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4371
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4372
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4373
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4374
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4375
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4376
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4377
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4378
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4379
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4380
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4381
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4382
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4383
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4384
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4385
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4387
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4388
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4390
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4391
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4392
    self activityNotification:'CVS: Removing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4394
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4395
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4397
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4399
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4400
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4402
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4417
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4421
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4422
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4423
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4424
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4425
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4426
    cmdOut remove.
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
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4430
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4431
    self activityNotification:'CVS Committing removal of ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4440
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4444
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4452
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4465
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4466
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4467
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4468
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4469
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4471
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4472
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4473
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4474
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4475
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4476
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4477
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4478
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4479
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4480
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4481
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4482
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4483
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4484
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4485
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4486
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4487
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4488
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4489
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4490
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4491
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4492
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4493
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4494
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4495
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4496
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4497
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4498
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4499
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4500
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4501
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4502
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4503
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4504
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4505
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4506
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4507
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4508
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4509
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4510
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4511
     filterRep may be a collection of repository names 
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4512
     (i.e. 'stx', 'exept', 'phx' etc.) to only report changes made to one
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4513
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4514
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4515
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4516
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4517
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4518
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4519
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4520
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4521
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4522
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4523
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4524
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4525
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4526
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4527
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4528
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4529
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4530
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4531
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4532
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4533
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4534
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4535
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4536
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4537
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4538
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4539
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4540
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4541
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4542
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4543
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4544
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4545
        cmd := cmd , ' history -x ARMT -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4546
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4547
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4548
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4549
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4550
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4551
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4552
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4553
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4554
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4555
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4556
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4557
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4558
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4559
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4560
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4561
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4562
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4563
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4564
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4565
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4566
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4567
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4568
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4569
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4570
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4571
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4572
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4573
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4574
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4575
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4576
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4577
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4578
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4579
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4580
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4581
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4582
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4583
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4584
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4585
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4586
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4587
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4588
                        words := line asCollectionOfWords.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4589
                        words size < 7 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4590
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4591
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4592
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4593
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4594
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4595
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4596
                            recordType = 'T' ifTrue:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4597
                                rev := words at:7.   "something like [expecco_2_8_0:HEAD]"
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4598
                                module := fileName := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4599
                                fileName := fileName copyAfterLast:$/.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4600
                            ] ifFalse:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4601
                                rev := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4602
                                fileName := words at:7.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4603
                                pkgDir := words at:8.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4604
                                module := pkgDir.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4605
                            ].
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4606
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4607
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4608
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4609
                                    time := words at:3.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4610
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4611
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4612
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4613
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4614
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4615
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4616
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4617
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4618
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4619
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4620
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4621
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4622
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4623
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4624
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4625
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4626
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4627
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4628
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4629
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4630
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4631
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4632
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4633
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4634
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4635
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4636
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4637
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4638
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4639
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4640
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4641
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4642
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4643
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4644
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4645
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4646
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4647
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4648
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4649
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4650
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4651
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4652
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4653
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4654
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4655
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4656
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4657
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4658
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4659
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4660
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4661
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4662
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4663
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4664
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4665
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4666
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4667
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4668
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4669
    "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
  4670
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4671
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4672
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4673
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4674
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4675
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4676
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4677
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4678
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4679
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4680
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4681
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4682
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4683
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4684
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4685
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4686
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4687
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4688
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4689
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4690
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4691
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4692
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4693
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4694
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4695
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4696
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4697
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4698
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4699
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4701
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4702
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4703
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4704
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4705
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4706
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4707
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4708
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4709
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4710
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4711
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4712
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4713
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4714
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4715
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4716
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4717
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4718
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4719
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4720
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4721
            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
  4722
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4723
            "/ 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
  4724
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4725
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4726
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4727
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4728
            "/ temporary fix Felix' bad string translation:
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  4729
            (aString startsWith:'§Header:') ifTrue:[
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  4730
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4731
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4732
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4733
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4734
                        autoFixHolder value ifFalse:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  4735
                            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
  4736
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4737
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4738
                        (autoFixHolder value 
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  4739
                            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
  4740
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4741
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4742
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4743
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4744
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4745
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4746
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  4747
            "/ 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
  4748
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4749
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4750
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4751
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4752
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4753
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4754
                            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
  4755
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4756
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4757
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4758
                            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
  4759
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4760
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4761
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4762
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4763
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4764
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4765
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4766
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4767
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4768
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4769
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4770
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4771
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4772
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4773
                            Dialog information:'Attention: the CVS version string is corrupted (Escaper-bug). Please fix it manually'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4774
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4775
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4776
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4777
                            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
  4778
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4779
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4780
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4781
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4782
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4783
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4784
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4785
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4786
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4787
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4788
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4789
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4790
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4791
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4792
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4793
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4794
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4795
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4796
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4797
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4798
revisionLogOf:clsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4799
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4800
    fileName:classFileName directory:packageDir module:moduleDir
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4801
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4802
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4803
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4804
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4805
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4806
     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
  4807
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4808
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4809
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4810
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4811
            #container          -> the RCS/CVS container file name 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4812
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4813
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4814
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4815
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4816
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4817
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4818
            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
  4819
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4820
              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
  4821
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4822
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4823
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4824
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4825
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4826
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4827
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4828
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4829
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4830
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4831
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4832
              #state                 -> the RCS state
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4833
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4834
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4835
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4836
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4837
            (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
  4838
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4839
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4840
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4841
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4842
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4843
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4844
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4845
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4846
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4847
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4848
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4849
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4850
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4852
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4853
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4854
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4855
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4856
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4857
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4858
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4859
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4860
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4861
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4862
        self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4863
            self createEntryFor:fullName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4864
                 module:moduleDir
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4865
                 in:(tempDir construct:modulePath) 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4866
                 revision:'1.1' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4867
                 date:'dummy' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4868
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4869
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4870
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4871
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4872
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4873
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4874
        (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
  4875
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4876
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4877
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4878
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4879
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4880
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4881
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4882
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4883
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4884
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4885
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4886
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4887
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4888
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4889
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4890
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4891
            msg := 'CVS: Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4892
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4893
            msg := 'CVS: Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4894
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4895
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4896
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4897
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4898
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4899
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4900
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4901
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4902
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4903
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4904
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4905
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4906
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4907
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4908
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4909
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4910
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4911
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4912
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4913
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4914
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4915
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4916
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4917
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4918
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4919
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4920
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4921
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4922
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4923
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4924
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4925
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4926
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4927
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4928
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4929
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4930
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4931
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4932
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4933
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4934
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4935
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4936
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4937
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4938
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4939
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4940
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4941
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4942
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4943
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4944
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4945
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4946
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4947
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4948
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4949
                         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
  4950
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4951
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4952
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4953
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4954
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4955
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4956
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4957
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4958
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4959
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4960
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4961
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4962
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4963
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4964
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4965
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4966
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4967
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4968
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4969
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4970
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4971
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4972
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4973
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4974
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4975
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4976
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4977
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4978
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4979
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4980
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4981
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4982
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4983
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4984
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4985
                    "/ 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
  4986
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4987
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4988
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4989
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4990
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4991
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4992
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4993
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4994
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4995
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4996
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4997
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4998
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4999
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5000
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  5001
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  5002
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  5003
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5004
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5005
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5006
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5007
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5008
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5009
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5010
        tempDir notNil ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5011
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5012
                ('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
  5013
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5014
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5015
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  5016
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  5017
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5018
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5019
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5020
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5021
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5022
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5023
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5024
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5025
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5026
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5027
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5028
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5029
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5030
    "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
  5031
    "Modified: / 29-01-1997 / 16:51:30 / stefan"
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  5032
    "Modified: / 05-02-2012 / 19:03:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5033
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5034
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5035
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5036
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5037
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5038
     each filled with:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5039
            #container          -> the RCS/CVS container file name 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5040
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5041
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5042
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5043
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5044
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5045
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5046
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5047
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5048
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5049
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5050
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5051
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5052
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5053
             -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
  5054
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5055
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5056
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5057
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5058
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5059
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5060
              #state                 -> the RCS state
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5061
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5062
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5063
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5064
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5065
            (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
  5066
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5067
        "
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
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5070
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5071
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5072
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5073
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5074
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5075
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5076
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5077
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5078
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5079
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5080
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5081
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5082
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5083
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5084
        ].
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5085
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  5086
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5087
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5088
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5089
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5090
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5091
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5092
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5093
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5094
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5095
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5096
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5097
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5098
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5099
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5100
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5101
            msg := 'CVS: Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5102
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5103
            msg := 'CVS: Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5104
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5105
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5106
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5107
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5108
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5109
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5110
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5111
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5112
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5113
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5114
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5115
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5116
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5117
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5118
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5119
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5120
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5121
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5122
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5123
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5124
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5125
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5126
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5127
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5128
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5129
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5130
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5131
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5132
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5133
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5134
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5135
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5136
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5137
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5138
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5139
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5140
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5141
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5142
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5143
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5144
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5145
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5146
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5147
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5148
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5149
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5150
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5151
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5152
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5153
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5154
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5155
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5156
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5157
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5158
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5159
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5160
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5161
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5162
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5163
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5164
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5165
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5166
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5167
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5168
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5169
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5170
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5171
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5172
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5173
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5174
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5175
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5176
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5177
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5178
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5179
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5180
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5181
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5182
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5183
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5184
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5185
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5186
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5187
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5188
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5189
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5190
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5191
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5192
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5193
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5194
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5195
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5196
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5197
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5198
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5199
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5200
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5201
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5202
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5203
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5204
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5205
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5206
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5207
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  5208
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5209
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5210
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5211
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5212
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5213
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5214
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5215
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5216
        tempDir notNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5217
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5218
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5219
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5220
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5221
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5222
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5223
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5224
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5225
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5226
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5227
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5228
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5229
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5230
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5231
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5232
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5233
    "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
  5234
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5235
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5236
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5237
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5238
    tempDir := nil.         "use the current directory"
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5239
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5240
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5241
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5242
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5243
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5244
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5245
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5246
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5247
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5248
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5249
    ].
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5250
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5251
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5252
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5253
        self activityNotification:('CVS: Fetching revision infos for %1%2'
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5254
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5255
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5256
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5257
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5258
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5259
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5260
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5261
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5262
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5263
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5264
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5265
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5266
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5267
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5268
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5269
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5270
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5271
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5272
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5273
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5274
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5275
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5276
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5277
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5278
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5279
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5280
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5281
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5282
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5283
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5284
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5285
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5286
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5287
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5288
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5289
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5290
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5291
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5292
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5293
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5294
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5295
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5296
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5297
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5298
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5299
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5300
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5301
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5302
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5303
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5304
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5305
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5306
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5307
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5308
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5309
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5310
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5311
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5312
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5313
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5314
    ].        
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5315
    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
  5316
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5317
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5318
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5319
    [
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5320
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5321
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5322
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5323
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5324
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5325
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5326
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5327
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5328
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5329
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5330
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5331
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5332
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5333
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5334
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5335
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5336
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5337
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5338
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5339
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5340
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5341
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5342
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5343
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5344
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5345
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5346
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5347
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5348
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5349
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5350
    "Created: / 12-10-2006 / 10:12:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5351
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5352
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5353
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5354
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5355
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5356
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5357
     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
  5358
     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
  5359
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5360
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5361
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5362
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5363
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5364
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5365
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5366
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5367
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5368
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5369
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5370
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5371
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5372
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5373
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5374
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5375
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5376
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5377
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5378
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5379
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5380
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5381
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5382
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5383
     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
  5384
     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
  5385
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5386
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5387
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5388
    |pathes alreadyWarned|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5389
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5390
    alreadyWarned := 0.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5391
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5392
    pathes := aCollectionOfClasses 
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5393
                collect:[:cls | 
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5394
                    |info path answer|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5395
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5396
                    cls isLoaded ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5397
                        Transcript showCR:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5398
                        alreadyWarned == 0 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5399
                            Dialog warn:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5400
                            alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5401
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5402
                            alreadyWarned == 1 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5403
                                answer := Dialog confirmWithCancel:('Cannot tag unloaded class: %1.\\Suppress further warnings?' withCRs bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5404
                                answer == nil ifTrue:[^ self].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5405
                                answer == true ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5406
                                    alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5407
                                ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5408
                            ] 
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5409
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5410
                        nil
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5411
                    ] ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5412
                        info := self sourceInfoOfClass:cls.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5413
                        info isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5414
                            Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5415
                            nil
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5416
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5417
                            path := info at:#pathInRepository ifAbsent:nil.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5418
                            path isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5419
                                Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5420
                            ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5421
                            path
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5422
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5423
                    ].
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5424
                ]
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5425
                thenSelect:[:path | path notNil].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5426
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5427
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5428
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5429
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5430
        pathes:pathes
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5431
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5432
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5433
     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
  5434
     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
  5435
     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
  5436
     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
  5437
     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
  5438
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5439
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5440
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5441
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5442
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  5443
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool path:pathInRepository
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5444
    "set a symbolicName for revision rev.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5445
     If rev is nil, set it for the head (most recent) revision.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5446
     If rev is 0, delete the symbolic name.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5447
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5448
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5449
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5450
     If filename is nil, the symbolicName for a whole package is set"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5451
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5452
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5453
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5454
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5455
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5456
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5457
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5458
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5459
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5460
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5461
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5462
     self setSymbolicName:'stable' revision:'1.1' overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5463
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5464
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5465
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5466
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5467
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5468
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5469
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5470
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5471
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5472
     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
  5473
     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
  5474
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5475
     If filename is nil, the symbolicName for a whole package is set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5476
     If multiple pathes are given, the revision MUST be nil."
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5477
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5478
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5479
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5480
    symbolicName := (symbolicNameArg includes:Character space) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5481
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5482
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5483
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5484
    pathesInRepository size > 1 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5485
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple pathes"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5486
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5487
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5488
    moduleDirs := pathesInRepository 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5489
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5490
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5491
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5492
    moduleDirs do:[:moduleDir |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5493
        |pathesInModule pathesInModuleAsArgument|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5494
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5495
        pathesInModule := pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5496
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5497
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5498
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5499
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5500
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5501
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5502
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5503
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5504
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5505
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5506
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5507
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5508
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5509
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5510
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5511
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5512
        pathesInModuleAsArgument := pathesInModule 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5513
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5514
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5515
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5516
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5517
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5518
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5519
                                        ].
1790
50c24ca2ae45 fix setting tags on more than one file
Stefan Vogel <sv@exept.de>
parents: 1788
diff changeset
  5520
        pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5521
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5522
        self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathesInModuleAsArgument).
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5523
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5524
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5525
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5526
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5527
        result := self  
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5528
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathesInModuleAsArgument) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5529
                    module:moduleDir 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5530
                    inDirectory:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5531
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5532
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5533
                    errorTo:errorStream.
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5534
        self activityNotification:nil.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5535
        (result not or:[errorStream size ~~ 0]) ifTrue:[
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5536
            SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5537
        ] ifFalse:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5538
            (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5539
                SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5540
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5541
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5542
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5543
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5544
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5545
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5546
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5547
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5548
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5549
        setSymbolicName:'test1' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5550
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5551
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5552
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5553
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5554
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5555
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5556
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5557
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5558
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5559
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5560
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5561
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5562
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5563
        revision:0 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5564
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5565
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5566
                  '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
  5567
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5568
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5569
    "Created: / 12-09-2006 / 12:36:44 / cg"
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5570
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5571
3931
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5572
standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5573
    "utility function: return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5574
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5575
    ^ 'Header: %1/%2/%3,v %4, %5 %6 %7 Exp'
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5576
        bindWith:moduleDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5577
        with:packageDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5578
        with:fileName
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5579
        with:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5580
        with:(Date today printStringFormat:'%y/%m/%d')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5581
        with:(Time now printStringFormat:'%h:%m:%s')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5582
        with:(OperatingSystem getLoginName)
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5583
        
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5584
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5585
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5586
     self 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5587
        revisionStringFor:Array 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5588
        inModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5589
        directory:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5590
        container:'Array.st' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5591
        revision:'123'          
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5592
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5593
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5594
    "Created: / 23-07-2012 / 18:46:29 / cg"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5595
!
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5596
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5597
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5598
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5599
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5600
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5601
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5602
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5603
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5604
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5605
     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
  5606
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5607
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5608
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5609
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5610
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5611
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5612
        modulePath :=  moduleDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5613
    ] ifFalse:[        
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5614
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5615
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5616
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5617
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5618
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5619
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5620
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5621
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5622
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5623
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5624
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5625
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5626
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5627
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5628
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5629
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5630
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5631
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5632
        msg := 'CVS: fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5633
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5634
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5635
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5636
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5637
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5638
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5639
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5640
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5641
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5642
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5643
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5644
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5645
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5646
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5647
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5648
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5649
            SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5650
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5651
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5652
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5653
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5654
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5655
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5656
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5657
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5658
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5659
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5660
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5661
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5662
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5663
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5664
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5665
                ((line includesString:'warning')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5666
                and:[ (line includesString:'is not')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5667
                and:[ (line includesString:'pertinent') ]]) ifTrue:[
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5668
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5669
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5670
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5671
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5672
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5673
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5674
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5675
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5676
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5677
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5678
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5679
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5680
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5681
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5682
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5683
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5684
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5685
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5686
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5687
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5688
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5689
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5690
        info isEmpty ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5691
            ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5692
            SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5693
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5694
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5695
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5696
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5697
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5698
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5699
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5701
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5702
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5703
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5704
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5705
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5706
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5707
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5708
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5709
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5710
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5711
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5712
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5713
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5714
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5715
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5716
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5717
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5718
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5719
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5720
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5721
version
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5722
    ^ '$Header$'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5723
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5724
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5725
version_CVS
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5726
    ^ '$Header$'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5727
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5728
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  5729
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5730
CVSSourceCodeManager initialize!