CVSSourceCodeManager.st
author Patrik Svestka <patrik.svestka@gmail.com>
Wed, 17 Feb 2021 15:24:09 +0100
branchjv
changeset 4568 524471ef6575
parent 4384 e28fcaaf93c7
permissions -rw-r--r--
Changing the encoding style header for fileOutAs
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4384
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
     1
"{ Encoding: utf8 }"
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
     2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
 COPYRIGHT (c) 1995 by Claus Gittinger
4330
998eb03f0736 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4207
diff changeset
     5
 COPYRIGHT (c) 2015 Jan Vrany
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    14
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    15
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    16
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    17
"{ NameSpace: Smalltalk }"
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
    18
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    19
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    20
	instanceVariableNames:''
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    21
	classVariableNames:'AuthorMap CMD_checkout CVSCommandSemaphore CVSCommandTimeout
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    22
		CVSCommitOptions CVSExecutable CVSModuleRoots CVSRoot CVSTempDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    23
		CVSUpdateOptions DisabledModules RecentTags
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
    24
		RecentlyCheckedModulesAndPackages RemoteCVS'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    25
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    26
	category:'System-SourceCodeManagement'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    27
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    28
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    29
VersionInfo subclass:#CVSVersionInfo
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
    30
	instanceVariableNames:'repositoryPathName timeZone changedLinesInfo'
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    31
	classVariableNames:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    32
	poolDictionaries:''
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    33
	privateIn:CVSSourceCodeManager
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    34
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
    35
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    36
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    37
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    38
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    39
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    40
 COPYRIGHT (c) 1995 by Claus Gittinger
4330
998eb03f0736 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4207
diff changeset
    41
 COPYRIGHT (c) 2015 Jan Vrany
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    42
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    43
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    44
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    45
 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
    46
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    47
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    48
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    49
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    50
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    57
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
    variable being set by a private.rc file).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
    Under that top, for each module (especially the stx module itself), 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    60
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
    If not specified otherwise, the module defaults to 'stx'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
        (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
    77
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
    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
    80
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    85
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    88
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    89
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    90
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    91
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
        - 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
    93
          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
    94
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
    Caveat:
3581
6d1eddd62950 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3580
diff changeset
    96
        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
    97
        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
    98
        compiled file).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    99
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
   100
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
   101
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
   102
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   107
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
                                        if false, disk access is used;
3948
mawalch
parents: 3931
diff changeset
   115
                                        files in CVSRoot must be accessible.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
        should acomplish this.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
        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
   185
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   191
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   192
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   193
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   194
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   195
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   199
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   200
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   201
addExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   202
    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   203
    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
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
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   206
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   207
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   208
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   209
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   210
exeptsPrivateSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   211
    "the actual stx repository as used within exept.
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   212
     Only valid within exept"
3918
5e9f77b71b40 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   213
    
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   214
    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   215
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   216
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   217
exeptsPublicSTXRepositoryModuleRoot
4048
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   218
    "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
   219
     Updated every night." 
eb9c79242508 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4047
diff changeset
   220
     
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   221
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   222
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   223
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   227
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   228
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   229
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   230
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   231
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   237
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   238
4047
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   239
    | s f top |
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   240
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   241
    CVSCommandSemaphore isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   242
        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
   243
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   244
    CVSCommitOptions isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   245
        CVSCommitOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   246
        CVSUpdateOptions := ''.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   247
    ].
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   248
    RemoteCVS isNil ifTrue:[
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   249
        RemoteCVS := true.
29cd13b30fb0 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4044
diff changeset
   250
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   251
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   252
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   253
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   254
    ].
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   255
    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   256
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   261
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   262
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   263
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   264
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   265
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   266
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   272
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   280
    DefaultManager isNil ifTrue:[
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   281
        DefaultManager := self.    
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   282
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   285
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   286
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   314
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   316
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   317
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   318
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   319
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   320
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   321
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   322
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   323
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   324
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   325
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   328
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   333
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   334
    AbstractSourceCodeManager initialize.
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   335
    self initialize.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   336
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   338
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   339
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   340
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   341
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   342
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   343
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   344
    "Modified: / 2.11.1997 / 17:08:27 / cg"
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   345
!
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   346
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   347
possiblyAddExeptsPrivateRepositoryToModuleRoots
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   348
    "/ for exept's convenience: if this is a host in our domain,
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   349
    "/ add the exept repository.
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   350
4182
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   351
    ((OperatingSystem getDomainName endsWith:'exept.de') or:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   352
     OperatingSystem getNetworkAddresses contains:[:eachSocketAddress| eachSocketAddress hostAddress startsWith: #[172 23 1]]]
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   353
    ) ifTrue:[
11078fb7ec8e #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4181
diff changeset
   354
        self addExeptsPrivateRepositoryToModuleRoots.
3411
7b1991501b5b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3390
diff changeset
   355
    ].
3909
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   356
!
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   357
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   358
validateWorkingCopy: path
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   359
    "Return true, if given path is a valid working 
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   360
     copy of this manager; false otherwise."
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   361
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   362
    ^ (path asFilename / 'CVS') isDirectory and:[ (path asFilename / 'CVS' / 'Root') exists ]
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   363
30f4d586370e Added support for auto-configuration of SCM for a package.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3891
diff changeset
   364
    "Created: / 02-10-2015 / 09:59:04 / jv"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   365
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   366
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   367
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   368
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   369
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   370
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   371
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   372
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   373
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   374
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   375
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   376
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   377
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   378
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   379
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   380
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   381
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   382
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   383
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   384
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   385
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   386
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   387
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   388
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   389
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   390
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   391
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   392
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   393
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   394
    "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
   395
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   396
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   397
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   398
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   399
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   400
    "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
   401
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   402
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   403
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   404
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   405
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   406
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   407
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   408
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   409
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   410
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   411
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   412
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   413
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   414
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   415
        CVSExecutable := nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   416
    ] ifFalse:[        
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   417
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   418
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   419
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   420
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   421
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   422
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   423
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   424
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   425
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   426
     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
   427
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   428
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   429
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   430
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   431
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   432
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   433
    d exists ifFalse:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   434
        d recursiveMakeDirectory.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   435
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   436
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   437
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   438
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   439
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   440
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   441
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   442
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   443
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   444
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   445
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   446
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   447
     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
   448
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   449
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   450
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   451
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   452
    "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   453
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   454
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   455
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   456
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   457
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   458
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   459
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   460
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   461
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   462
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   463
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   464
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   465
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   466
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   467
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   468
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   469
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   470
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   471
    "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
   472
3848
2768cbd5b7f1 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3834
diff changeset
   473
    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   474
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
     self recentTag
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   477
    "
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   478
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   479
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   480
recentTag:aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   481
    "a place to remember recently set tags (to share between File and SystemBrowser)"
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   482
4102
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   483
    aString isEmpty ifTrue:[
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   484
        ^ self.
8556250d9f86 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4100
diff changeset
   485
    ].
3620
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   486
    RecentTags isNil ifTrue:[
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   487
        RecentTags := OrderedCollection new.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   488
    ].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   489
    RecentTags remove:aString ifAbsent:[].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   490
    RecentTags addFirst:aString.
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   491
    RecentTags size > 10 ifTrue:[ RecentTags removeLast].
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   492
!
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   493
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   494
recentTags
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   495
    "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
   496
b333460c14b1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3605
diff changeset
   497
    ^ RecentTags
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   498
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   499
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   500
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   501
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   502
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   503
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   504
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   505
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   506
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   507
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   508
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   509
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   510
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   511
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   512
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   513
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   514
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   515
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   516
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   517
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   518
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   519
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   520
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   521
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   522
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   523
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   525
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   528
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   531
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   533
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   536
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   544
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   545
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   546
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   561
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   562
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   563
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   564
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   565
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   566
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   567
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   568
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   569
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   570
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   571
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   572
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   573
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   574
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   575
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   576
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   577
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   578
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   579
    "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
   580
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   581
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   582
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   584
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   585
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   586
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   588
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   589
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   590
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   591
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   594
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   599
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   600
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   601
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   602
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   603
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   604
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   605
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   606
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   607
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   608
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   609
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   610
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   611
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   612
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   613
authorMappingFor:authorName
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   614
    "allows for author names to be mapped on the fly
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   615
     when retrieving a revisionLog or other statistics.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   616
     Useful when a login name is changed, and you still want to
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   617
     create reasonable logs"
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   618
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   619
    AuthorMap isNil ifTrue:[ ^ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   620
    ^ AuthorMap at:authorName ifAbsent:[ authorName ].
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   621
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   622
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   623
     AuthorMap := Dictionary new
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   624
                    at:'claus' put:'cg';
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   625
                    yourself.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   626
    "
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   627
!
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
   628
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   629
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   630
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   631
     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
   632
     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
   633
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   634
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   635
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   636
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   637
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   638
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   639
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   640
                close.
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
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   643
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   644
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   645
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   646
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   647
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   648
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   649
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   650
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   651
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   652
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   653
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   654
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   655
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   656
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   657
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   658
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   659
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
    "
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
   676
      self checkOut:'libbasic/Integer.st' module:'stx' in:'/tmp' asFilename
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   761
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   764
    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   771
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   772
    entriesInStream := entries readStreamOrNil.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   773
    entriesInStream isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
        "/
3754
6e38fdb567fe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3711
diff changeset
   777
        |root|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   780
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   781
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   782
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   783
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   784
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   788
        entriesInStream := (cvsDir construct:'Repository') writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   790
        path := path asStringWith:$/.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   791
        entriesInStream nextPutLine:(root, '/', path).
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   792
        entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
        "/ make new Entries file.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   795
        entriesInStream := entries writeStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
        newStream := newName writeStream.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   801
        [(line := entriesInStream nextLine) notNil] whileTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
                    newStream close.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   808
                    entriesInStream close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   811
                newStream nextPutLine:line
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
        newName renameTo:entries.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   815
        entriesInStream close.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   816
        entriesInStream := newStream.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
    ].
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   818
    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
   819
    entriesInStream syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
        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
   824
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   826
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   827
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   828
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   830
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   834
     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
   835
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   836
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   837
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   838
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   840
        with:'.cvsignore'
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   841
        andDefaultContents:
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   842
'makefile
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   843
*.STH
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   844
*.@@@
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   845
ntLibInit.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   846
*.res
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   847
*.RES
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   848
*.sc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   849
*.c
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   850
objbc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   851
objvc
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   852
objmingw
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   853
'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   854
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   855
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   856
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   857
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   859
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   860
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   861
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   862
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   863
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   864
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   865
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   866
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   867
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   868
3821
b2b15311c3cf class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3820
diff changeset
   869
    ^ self 
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   870
        createLocalDirectory:packageDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   871
        inModule:moduleDir 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   872
        with:fileToCheckout 
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   873
        andDefaultContents:nil
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   874
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   875
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   876
     self createLocalDirectory:'libbasic' inModule:'stx'
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   877
    "
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   878
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   879
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   880
    "Created: / 18-01-2000 / 20:55:52 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   881
    "Modified: / 16-07-2013 / 19:49:26 / cg"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   882
!
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   883
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   884
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout andDefaultContents:defaultContents
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   885
    "create a local working directory for module/package, and checkout the
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   886
     given file there.
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   887
     Return the name of a temporary directory containing the package, or nil"
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   888
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
   889
    |path absolutePath tempdir unixPath|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   892
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   893
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   894
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   895
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   896
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   897
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   899
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   901
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   905
            ].
3592
3407ff53d7d1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   906
            unixPath := path name asUnixFilenameString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
            absolutePath directory recursiveMakeDirectory.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   914
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
            "now create the file"
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   916
            absolutePath writingFileDo:[:s |
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   917
                defaultContents notNil ifTrue:[
3949
0514468a25e4 #BUGFIX
mawalch
parents: 3948
diff changeset
   918
                    s nextPutAll:defaultContents.
3820
f4d986c2fa4b class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3817
diff changeset
   919
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   931
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   932
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   933
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   934
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   943
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   945
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   951
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   952
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   955
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   956
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   957
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   961
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   962
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   963
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   966
    "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
   967
    "Created: / 18-01-2000 / 20:55:52 / cg"
3352
f54453a6b32c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3336
diff changeset
   968
    "Modified: / 16-07-2013 / 19:49:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   974
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   976
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   977
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   978
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   984
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   987
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1000
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1001
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1003
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1005
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1006
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1007
     if dir ~= nil, execute command in that directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1008
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1009
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1010
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1011
    ^ self
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1012
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1013
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1014
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1015
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1016
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
  1017
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1018
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1019
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1020
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1021
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1022
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1023
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1024
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1025
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1026
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog outputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1027
    "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
  1028
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1029
     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
  1030
     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
  1031
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1032
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1033
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1034
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1035
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1036
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1037
        pipe:false
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1038
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1039
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1040
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1041
    "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
  1042
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1043
    "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
  1044
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1045
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1046
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1047
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1048
     execute command in the dirArg directory.
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1049
     The doLog argument, if false suppresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1050
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1051
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1052
    ^ self
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1053
        executeCVSCommand:cvsCommand
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1054
        module:moduleName
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1055
        inDirectory:dirArg
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1056
        log:doLog
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1057
        pipe:doPipe
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1058
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1059
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1060
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1061
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1062
    "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
  1063
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1064
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1065
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1066
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1067
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
  1068
    "execute command and prepend cvs command name and global options.
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  1069
     execute command in the dirArg directory (or the current directory if dirArg is nil).
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1070
     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
  1071
     in the cvs log file (used when reading / extracting history)"
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1072
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1073
    |command cvsRoot rslt ok pathOfDir errorString osProcess|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1074
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1075
    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
  1076
        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
  1077
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1078
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1079
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1080
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  1081
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1082
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1083
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1084
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1085
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1086
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1087
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1088
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1089
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1090
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1091
    "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
  1092
    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
  1093
        (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
  1094
            (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
  1095
                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
  1096
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1097
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1098
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1099
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1100
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  1101
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1102
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1103
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1104
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1105
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1106
    doPipe ifTrue:[
4064
ef1fbf4480c0 #OTHER by mawalch
mawalch
parents: 4055
diff changeset
  1107
        rslt := PipeStream
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1108
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1109
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1110
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1111
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1112
    ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1113
        osProcess := OSProcess new
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1114
                        command:command;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1115
                        outStream:outStreamOrNil;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1116
                        errorStream:outStreamOrNil;
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1117
                        directory:pathOfDir.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1118
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1119
        Processor isDispatching ifFalse:[
3333
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1120
            "/ special hack to allow source code access during the initialization
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1121
            "/ phase (when threading is not yet enabled in the ProcessorScheduler)
50af27c01dd0 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3330
diff changeset
  1122
            "/ execute the command in this thread, as opposed to the code below.
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1123
            ok := rslt := osProcess execute.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1124
        ] ifTrue:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1125
            CVSCommandSemaphore critical:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1126
                |errOut done|
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1127
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1128
                errOut := WriteStream on:''.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1129
                osProcess errorStream:errOut.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1130
                ok := osProcess startProcess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1131
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1132
                [
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1133
                    done := true.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1134
                    (osProcess waitUntilFinishedWithTimeout:self cvsCommandTimeout) isNil ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1135
                        (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1136
                                                bindWith:self cvsCommandTimeout with:command)) 
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1137
                        ifTrue:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1138
                            done := false
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1139
                        ] ifFalse:[
4181
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1140
                            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1141
                            osProcess terminate.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1142
                            ok := false.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1143
                            errorString := 'CVS command timeout'.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1144
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1145
                    ] ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1146
                        ok := rslt := osProcess finishedWithSuccess.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1147
                        ok ifFalse:[
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1148
                            errorString := errOut contents.
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1149
                        ].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1150
                    ]
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1151
                ] doUntil:[done].
7ada81ccac23 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4164
diff changeset
  1152
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1153
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1154
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1155
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1156
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
3390
caf7c8e6fdce class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3389
diff changeset
  1157
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1158
            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
  1159
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1160
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1161
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1163
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1164
    "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
  1165
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1166
    "Created: / 28-02-2012 / 17:30:34 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1167
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1168
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1169
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1170
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1171
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1172
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1173
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1174
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1175
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1176
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1177
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1178
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1179
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1180
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1181
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1182
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1183
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1184
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1185
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1186
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1187
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1188
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1189
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1190
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1191
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1192
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1193
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1194
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1195
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1196
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1197
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1198
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1199
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1200
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1201
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1202
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1203
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1204
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1205
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1206
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1207
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1208
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1209
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1210
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1211
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1212
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1213
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1214
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1215
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1216
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1217
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1218
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1219
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1220
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1221
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1222
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1223
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1224
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1225
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1226
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1227
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1228
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1229
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1230
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1231
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1232
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1233
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1234
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1235
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1236
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1237
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1238
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1239
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1240
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1241
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1242
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1243
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1244
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1245
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1246
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1247
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1248
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1249
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1250
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1251
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1252
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1253
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1254
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1255
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1256
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1257
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1258
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1259
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1260
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1261
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1262
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1279
    cmd := 'import -m "checkin from stx browser" ', moduleDir, ' initialV initialR'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1281
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
        module:moduleDir
3574
788008ee149f class: CVSSourceCodeManager
caellwein
parents: 3470
diff changeset
  1283
        inDirectory:(tempdir / moduleDir) name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
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
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1301
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1302
    "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
  1303
     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
  1304
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1305
     The returned information is a CVSVersionInfo object (used to be an IdentityDictionary)
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1306
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1307
              #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
  1308
              #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
  1309
              #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
  1310
              #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
  1311
              #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
  1312
              #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
  1313
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1314
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1315
    |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
  1316
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1317
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1318
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1319
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1320
    [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
  1321
        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
  1322
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1323
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1324
                    revLine1 := inStream nextLine.
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
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1327
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1328
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1329
        record := CVSVersionInfo "IdentityDictionary" new.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1330
        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
  1331
        "/ 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
  1332
        (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
  1333
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1334
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1335
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1336
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1337
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1338
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1339
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1340
                s := subEntry restAfter:word withoutSeparators:true.
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1341
                s notNil ifTrue:[
3330
0c8235ef61c1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3324
diff changeset
  1342
                    key == #'author' ifTrue:[ s := self authorMappingFor:s ].
3324
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1343
                    record at:key put:s.
afd8cfea1bdd class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3323
diff changeset
  1344
                ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1345
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1346
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1347
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1348
        "first revision does not have a 'lines:' entry"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  1349
        (record at:#numberOfChangedLines ifAbsent:[nil]) isNil ifTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1350
            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
  1351
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1352
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1353
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1354
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1355
        [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
  1356
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1357
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1358
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1359
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1360
                    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
  1361
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1362
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1363
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1364
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1365
                    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
  1366
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1367
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1368
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1369
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1370
        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
  1371
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1372
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1373
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1374
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1375
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1376
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1377
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1378
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1379
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1380
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1381
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1382
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
    "/
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
  1393
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1411
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1416
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1422
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1423
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1425
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1426
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1429
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1432
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1433
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1434
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1435
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1436
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1438
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1439
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1440
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1443
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1444
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1452
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1477
updatedRevisionStringOf:aClass forRevision:newRevision andUser:userName with:originalVersionString
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1478
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1479
     and return a new version string with changed revisionNr, dateAndTime and author.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1480
     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
  1481
     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
  1482
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1483
    |idx leftPart rightPart vsnString newVsn dateAndTimePart newDateAndTimePart prevUser|
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1484
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1485
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1486
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1487
    "/ search for ,v
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1488
    idx := originalVersionString indexOfSubCollection:'.st,v'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1489
    idx == 0 ifTrue:[^ nil].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1490
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1491
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1492
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1493
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1494
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1495
    vsnString := rightPart copyTo:idx - 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1496
    rightPart := rightPart copyFrom:idx + 1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1497
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1498
    newRevision isNil ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1499
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1500
             "/ already a modified class
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1501
"/            ('already modified: ' , vsnString) printNL.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1502
            ^ nil
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1503
        ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1504
        newVsn := vsnString , 'm'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1505
    ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1506
        newVsn := newRevision
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1507
    ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1508
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1509
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1510
    idx := rightPart indexOfSeparatorStartingAt:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1511
    dateAndTimePart := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1512
    rightPart := rightPart copyFrom:idx+1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1513
    idx := rightPart indexOfSeparator.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1514
    prevUser := rightPart copyTo:idx-1.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1515
    rightPart := rightPart copyFrom:idx+1.
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
    "/ originalVersionString:
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  1518
    "/      '$Header$'
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1519
    "/ leftPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1520
    "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1521
    "/ dateAndTimePart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1522
    "/      '2013/01/24 10:14:27'
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1523
    "/ rightPart:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1524
    "/      'Exp $'
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1525
    newDateAndTimePart := Timestamp now printStringFormat:'%(year)-%(month)-%(day) %H:%m:%s'.
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1526
    ^ leftPart , ' ' , newVsn , ' ' , newDateAndTimePart , ' ' , userName , ' ' , rightPart
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1527
!
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1528
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1529
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1530
    "update a revision string: take the original versionString,
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  1531
     and return a new version string with changed revisionNr."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1532
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1533
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1534
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1535
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1536
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1539
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1540
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1542
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1544
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1549
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
        (vsnString endsWith:'m') ifTrue:[
4094
c0637cbac519 #OTHER by mawalch
mawalch
parents: 4089
diff changeset
  1551
             "/ already a modified class
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1555
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1560
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1562
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1563
    "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
  1564
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1565
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1566
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1567
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1568
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1569
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1571
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1572
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1573
2449
vrany
parents: 2403
diff changeset
  1574
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1575
vrany
parents: 2403
diff changeset
  1576
    "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
  1577
    ^ true.
2449
vrany
parents: 2403
diff changeset
  1578
vrany
parents: 2403
diff changeset
  1579
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1580
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1581
vrany
parents: 2403
diff changeset
  1582
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1583
!
vrany
parents: 2403
diff changeset
  1584
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1585
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1586
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1587
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1588
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1589
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1590
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1591
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1592
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1593
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1594
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1595
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1596
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1597
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1598
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1599
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1600
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1601
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1602
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1603
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1604
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1605
    "Modified: / 19-04-2011 / 13:52:42 / cg"
3659
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1606
!
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1607
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1608
versionInfoClass
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1609
5a07cb594e54 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3649
diff changeset
  1610
    ^ CVSVersionInfo
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1611
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1612
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1613
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1614
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1615
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1616
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1617
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1618
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1619
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1620
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1621
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1622
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1623
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1624
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1625
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1626
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1627
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1628
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1629
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1630
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1631
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1632
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1633
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1634
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1635
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1636
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1637
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1638
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1639
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1640
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1641
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1642
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1643
    |tempdir cmd checkoutName logMsg revision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1644
     cmdOut whatHappened idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1645
     newRevision  msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1646
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1647
     editor checkInRepaired didAccept emphasizedText repairedText out
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1648
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1649
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1650
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1651
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1652
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1653
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1655
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1656
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1657
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  1658
        modulePath := moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1659
    ] ifFalse:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1660
        modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1661
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1662
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
        "/ a new file ...
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1666
        ^ self
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1667
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1668
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1669
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1670
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1671
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1672
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1674
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1675
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1676
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1677
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1678
        "/ 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
  1679
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1681
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1682
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1683
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1684
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1685
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1686
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1687
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1688
            ^ false
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
        "/ 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
  1693
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1694
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1695
        "/ correct our current time, so that converting it will give us UTC
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1696
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1697
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1698
        self createEntryFor:checkoutName
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1699
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1700
             in:(tempdir construct:modulePath)
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1701
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1702
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1704
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1705
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1708
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1709
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
        ] do:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1713
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1714
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1715
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1716
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1717
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1718
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1719
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1720
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1721
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1722
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  1723
        self activityNotification:'CVS: Merging ' , containerFilename , ' with repository version...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1724
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1725
        cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1726
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1727
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1728
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1729
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1730
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1731
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1732
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1733
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1734
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1735
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1736
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1737
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1739
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1740
            "/   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
  1741
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1744
                whatHappened := cmdOut contentsAsString.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1746
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1749
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1750
            "/ no change
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
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1753
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1754
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1755
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1756
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
        ].
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
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1761
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1762
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
                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
  1768
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
            changeLog notNil ifTrue:[
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1770
                |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1771
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1772
                s := CharacterWriteStream new.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
                changesAsLogged := s contents.
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
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1777
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1779
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1780
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1781
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1783
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1784
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1786
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1788
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1791
                            and:[(line startsWith:'Merging') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1792
                            and:[line size > 0]]]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1795
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1796
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1797
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1798
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1799
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1800
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1801
            or:[changeLog isNil
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1802
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1803
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1804
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1805
                "/
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1806
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1807
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1808
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1809
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1810
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1811
                "/ 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
  1812
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1813
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1814
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1815
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1816
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  1817
                mySource := someText.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1818
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
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
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1821
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1822
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1823
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1824
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1825
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1826
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1827
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1828
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1829
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1830
                                   abortable:false
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1831
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1832
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1833
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1834
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1835
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1836
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1838
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1839
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
  1840
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1841
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1842
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1843
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1844
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1845
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1847
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1848
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1849
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1850
                                   message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1851
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1852
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1853
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1854
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1855
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1856
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1857
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1858
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1859
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1860
                                label:'merged version'.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1861
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1862
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1863
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1865
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1866
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1867
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1868
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1869
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1870
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1871
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1872
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1873
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1874
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1875
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1884
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
"/                ].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  1887
                Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1888
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1889
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1890
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1891
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1892
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1893
                "/ 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
  1894
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1895
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1896
                changesAsLogged := changesAsLogged asCollectionOfLines.
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
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1899
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1900
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1901
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1902
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1903
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1904
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1905
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1906
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1907
                     message:msg
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1908
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1909
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1910
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1911
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1912
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1913
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1914
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1915
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1916
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1917
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1918
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1919
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1920
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1921
                        label:'newest repository version'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1922
                ].
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
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1926
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1927
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1928
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1929
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1930
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
                    "/ ... accept will check it in.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1935
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1936
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1937
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1938
                                emphasizeMergedDiff3Text:emphasizedText
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1939
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1940
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1942
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1943
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1945
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1946
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1947
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1948
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1949
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1950
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1951
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1952
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1953
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1954
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1955
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1956
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1957
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1958
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1959
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1960
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1961
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1962
                        editor := RCSConflictEditTextView
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1963
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  1964
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1965
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1966
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1967
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1968
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1969
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1970
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1971
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1972
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1973
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1974
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1975
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1976
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1977
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1978
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1979
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  1980
                            (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
  1981
                                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
  1982
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1983
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1984
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1985
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1986
                    ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1987
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1988
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1989
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1990
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1991
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1992
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1993
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1994
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1995
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1996
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1997
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1998
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1999
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2000
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2001
                checkInRepaired ifTrue:[
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2002
                    Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...'
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2003
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2004
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2005
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2006
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2007
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2008
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2009
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2010
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2011
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2012
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2013
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2014
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2015
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2016
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2017
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2018
                ] ifFalse:[
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
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2021
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2022
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2023
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2024
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2025
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2026
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2027
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2028
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2029
            ]
3264
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
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2032
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2033
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2034
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2036
        self activityNotification:'CVS: Saving ' , containerFilename , ' in repository...'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2037
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2038
        logMsg := logMsg replChar:$"  withString:'\"'.
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
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2041
            "/ save the log message into another tempFile ...
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2042
            |s|
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2043
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2044
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2045
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2046
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2047
            s close.
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
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2050
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2051
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2052
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2053
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2054
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2055
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2056
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2057
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2058
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2059
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2060
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2061
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2062
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2063
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2064
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2065
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2066
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2067
            executeCVSCommand:cmd
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2068
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2069
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2070
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2071
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2072
                whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2073
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2074
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2075
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2076
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2077
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2078
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2079
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2080
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2081
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2082
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2083
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2084
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2085
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2086
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2087
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2088
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2089
            whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2090
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2091
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2092
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2093
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2094
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2095
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2096
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2097
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2098
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2099
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2100
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2101
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2102
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2103
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2104
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2105
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2106
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2107
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2108
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2109
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2110
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2111
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  2112
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2113
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2114
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2115
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2116
    "Modified: / 12-11-2010 / 11:04:10 / cg"
2823
70f154c6ee66 changed: #checkin:text:directory:module:logMessage:force:
sr
parents: 2822
diff changeset
  2117
    "Modified: / 19-04-2012 / 14:18:24 / sr"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2118
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2120
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2121
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2122
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2124
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2125
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2126
    |tempdir cmd checkoutName logMsg revision newestRevision logTmp
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2127
     cmdOut whatHappened s entry idx changeLog changesAsLogged l
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2128
     newRevision newString binRevision className msg answer didMerge
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2129
     modulePath time
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2130
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2131
     emSep comment force conflictResolvedManually revisionOption|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2135
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2136
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2137
        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
  2138
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2139
    ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2140
    revision := "cls revision" cls revisionOfManager:self.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2141
    (revision notNil and:[revision endsWith:$m])
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2142
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2143
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2145
        "/ must use the original revision string.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2146
        revision := revision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2147
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2148
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
        revision ~= binRevision ifTrue:[
3317
ca815e9ab789 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3295
diff changeset
  2150
            Transcript showCR:('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?'))
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2153
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2154
    revision isNil ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2155
        revision := newestRevision := self newestRevisionOf:cls.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
            force ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2158
                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
  2159
                revision isNil ifTrue:[
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2160
                    revision := '1.0'   "/ initial checkin
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2161
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
            ] ifFalse:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2163
                revision := '1.0'   "/ initial checkin
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2164
            ]
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2165
        ] ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2166
            revision == #deleted ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2167
                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
  2168
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2169
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2170
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2171
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2172
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2173
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2174
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2175
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2176
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2177
            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
  2178
            ^ false.
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2179
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2181
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2182
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2183
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2188
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2190
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2195
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2197
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2198
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2199
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2200
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2201
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2202
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2203
        "/ 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
  2204
        "/
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2205
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2206
            modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2207
        ] ifFalse:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2208
            modulePath :=  moduleDir , '/' , packageDir.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2209
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2210
        checkoutName :=  modulePath , '/' , classFileName.
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
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2213
        "/ correct our current time, so that converting it will give us UTC
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2214
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2215
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2216
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2217
        self createEntryFor:checkoutName
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2218
             module:moduleDir
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2219
             in:(tempdir construct:modulePath)
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2220
             revision:revision
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2221
             date:(self cvsTimeString:time)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2222
             special:''
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2223
             overwrite:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2224
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2225
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2226
        "/ copy-over our current version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2227
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2228
        Error handle:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2229
            self reportError:'cannot copy-over filedOut class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2230
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2231
        ] do:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2232
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
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
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2236
        "/ synchronize i.e. merge in any changes
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2237
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2238
        self activityNotification:'CVS: Merging ' , cls name , ' with repository version...'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2239
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2240
        revisionOption := ''.
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2241
        (revision asCollectionOfSubstringsSeparatedBy:$.) size > 2 ifTrue:[
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2242
            "must be a branch, compare with branch revision"
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2243
            revisionOption := '-r ', revision copyUpToLast:$..
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2244
        ].
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2245
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2246
        cmd := 'update %1 %4 %2 >"%3"'
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2247
            bindWith:CVSUpdateOptions
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2248
            with:classFileName
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2249
            with:cmdOut name
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2250
            with:revisionOption.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2251
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2252
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2253
            executeCVSCommand:cmd
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2254
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2255
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2256
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2257
            force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2258
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2259
                    "/ no container
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2260
                    "/ someone fiddled around with repository ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2261
                    (cls binaryRevision notNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2262
                        (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
  2263
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2264
                            cls setBinaryRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2265
                            ^ 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
  2266
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2267
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2268
                    (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
  2269
                    ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2270
                        ^ false
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2271
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2272
                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2273
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2274
                "/ is the version correct ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2275
                newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2276
                    newestRevision := self newestRevisionOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2277
                    newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2278
                        (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
  2279
                            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2280
                        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2281
                        ^ self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2282
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2283
                            source:sourceFileName logMessage:logMessage force:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2284
                    ].
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2285
                ].
2483
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2286
"/            revision > newestRevision ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2287
"/                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
  2288
"/                ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2289
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2290
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2291
"/                    ^ 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
  2292
"/                ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2293
"/            ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2294
"/
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2295
"/            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
  2296
"/            ^ false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2297
                "/ if we arrive here, proceed as if merged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2298
                whatHappened := 'M initial'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2299
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2300
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2301
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2302
            "/ check what happened - the contents of the cmdOut file may be:
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2303
            "/   empty   -> nothing changed
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2304
            "/   M xxx   -> merged-in changes from other users
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2305
            "/   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
  2306
            "/              needs special action
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2307
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2308
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  2309
                whatHappened := cmdOut contentsAsString.
3358
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2310
            ] ifFalse:[
39d7c4a6afbe class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3352
diff changeset
  2311
                self breakPoint:#cg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2312
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2313
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2314
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2315
        (whatHappened isEmptyOrNil) ifTrue:[
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
            "/ no change
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2318
            "/
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2319
        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2320
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2321
            force ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2322
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2323
"/                (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
  2324
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2325
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2326
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  2327
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2328
"/            ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2329
                self postCheckInClass:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2330
            ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2331
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2332
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2333
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2334
                    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
  2335
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2336
                    entry := (changeLog at:#revisions) first.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2337
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2338
                    newString isEmptyOrNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2339
                        'CVSSourceCodeManager [error]: missng revisionString' errorPrintCR
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2340
                    ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2341
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2342
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2343
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2344
                        ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2345
                            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2346
                        ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2347
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2348
                ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2349
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2350
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2351
            ^ true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2352
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2353
        Verbose == true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2354
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2355
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2356
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2357
        force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2358
            revision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2359
                changeLog := self revisionLogOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2360
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2361
                changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2362
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2363
            changeLog notNil ifTrue:[
4100
fcabc1395987 #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 4094
diff changeset
  2364
                s := CharacterWriteStream on:''.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2365
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2366
                changesAsLogged := s contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2367
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2368
                "/ mhmh - that should not happen
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2369
                changesAsLogged := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2370
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2371
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2372
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2373
        didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2374
        conflictResolvedManually := checkInRepaired := checkInNew := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2375
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2376
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2377
        "/ cvs above rel10 returns a multiline info ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2378
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2379
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2380
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2381
        whatHappened := whatHappened select:[:line |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2382
                            (line startsWith:'RCS file') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2383
                            and:[(line startsWith:'retrieving') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2384
                            and:[(line startsWith:'Merging') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2385
                            and:[line size > 0]]]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2386
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2387
        whatHappened := whatHappened asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2388
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2389
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2390
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2391
            "/ merged in changes / resurrected
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2392
            "/
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2393
            (force
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2394
            or:[changeLog isNil
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2395
            or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2396
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2397
                "/ pretty good - nothing has changed in the meanwhile
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2398
                "/
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2399
                Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2)...' bindWith:className with:modulePath).
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2400
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2401
                |mySource mergedSource |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2402
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2403
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2404
                "/ 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
  2405
                "/ and version have been merged.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2406
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2407
                didMerge := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2408
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2409
3858
9f725ed4f3b8 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3848
diff changeset
  2410
                s := CharacterWriteStream new.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2411
                self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2412
                mySource := s contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2413
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2414
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2415
                mySource = mergedSource ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2416
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2417
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2418
I have merged your version with the newest repository version,
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2419
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2420
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2421
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2422
                    self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2423
                                   message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2424
                                   log:changesAsLogged
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2425
                                   abortable:false
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2426
                                   option:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2427
                    didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2428
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2429
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2430
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2431
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2432
into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2433
into a new common revision which may be different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2434
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
  2435
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2436
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2437
most recent version in the repository. If that does not contain an acceptable version,
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2438
change methods as required and check in again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2439
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2440
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2441
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2442
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2443
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2444
                    answer := self checkinTroubleDialog:'Merging versions'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2445
                                   message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2446
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2447
                                   abortable:true
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2448
                                   option:'Stop - see first'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2449
                                   option2:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2450
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2451
                    answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2452
                        (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
  2453
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2454
                            s := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2455
                            self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2456
                            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2457
                            answer := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2458
                        ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2459
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2460
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2461
                    answer ~~ true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2462
                        answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2463
                            DiffCodeView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2464
                                openOn:mySource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2465
                                label:'current version'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2466
                                and:mergedSource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2467
                                label:'merged version'.
3626
1df5441e1e8c class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3623
diff changeset
  2468
3265
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
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2471
                        ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2472
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2473
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2474
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2475
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2476
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2477
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2478
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2479
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2480
"/into the newest revision. This will combine the other version with your changes
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2481
"/into a new common revision which is different from both.
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2482
"/Although convenient, it may fail to create the expected result in certain situations.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2483
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2484
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2485
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2486
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2490
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2491
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2492
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
"/                ].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2494
                Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2495
            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2496
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2497
            (whatHappened startsWith:'C ') ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2498
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2499
                "/ conflict; someone else checked in something in the meanwhile,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2500
                "/ 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
  2501
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2502
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2503
                changesAsLogged := changesAsLogged asCollectionOfLines.
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
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2506
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2507
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2508
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2509
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
  2510
and change your methods avoiding conflicts. Then checkin again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2511
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2512
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2513
                answer := self checkinTroubleDialog:'Version conflict'
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2514
                     message:msg
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2515
                     log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2516
                     abortable:false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2517
                     option:'Show conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2518
                     option2:'Resolve conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2519
                     option3:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2520
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2521
                answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2522
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2523
                    "/ show conflicts in a 3-way DiffTextView ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2524
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2525
                    Diff3TextView
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2526
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2527
                        label:'your version (checkin attempt)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2528
                        label:'original (base version)'
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2529
                        label:'newest repository version'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2530
                ].
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
                answer == #option2 ifTrue:[
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
                    "/ allow checkin of repair version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2535
                    "/ this is error prone ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2536
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2537
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2538
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2539
                    "/ ... accept will check it in.
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
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2542
                    emSep := (Array with:(#color->Color black)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2543
                                 with:(#backgroundColor->Color green)).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2544
                    emphasizedText := Diff3TextView
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2545
                                emphasizeMergedDiff3Text:emphasizedText
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2546
                                emphasize1:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2547
                                                  with:(#backgroundColor->Color blue))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2548
                                emphasize2:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2549
                                                  with:(#backgroundColor->Color red))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2550
                                emphasizeSep:emSep.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2551
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2552
                    comment :=
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2553
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2554
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2555
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2556
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2557
"/ Each such conflict is surrounded by green text (like this paragraph).
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2558
"/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2559
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2560
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2561
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2563
'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2564
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2565
                    emphasizedText := comment , emphasizedText.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2566
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2567
                    didAccept := false. checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2568
                    [didAccept not and:[checkInRepaired]] whileTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2569
                        editor := RCSConflictEditTextView
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2570
                                    setupWith:emphasizedText
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2571
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2572
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2573
                        editor acceptAction:[:dummy |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2574
                            repairedText := editor list.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2575
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2576
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2577
                        didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2578
                        editor topView openModal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2579
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2580
                        didAccept ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2581
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2582
                            ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2583
                                checkInRepaired := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2584
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2585
                        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2586
                            "/ check if all green-stuff (separators) have been removed
3685
d5d6862b4cc4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3677
diff changeset
  2587
                            (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
  2588
                                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
  2589
                                didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2590
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2591
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2592
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2593
                    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2594
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2595
                    checkInRepaired ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2596
                        [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2597
                            out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2598
                            out nextPutAll:(repairedText asString string).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2599
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2600
                            out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2601
                        ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2602
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2603
                            checkInRepaired := false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2604
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2605
                    ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2606
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2607
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2608
                answer == #option3 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2609
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2610
                    "/ force checkin of new version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2611
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2612
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2613
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2614
                    "/ ... accept will check it in.
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
                        out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2618
                        self fileOutSourceCodeOf: cls on:out.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2619
                        out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2620
                        didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2621
                        checkInNew := checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2622
                    ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2623
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2624
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2625
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2626
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2627
                checkInRepaired ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2628
                    checkInNew ifTrue:[
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2629
                        Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (force)...' bindWith:className with:modulePath).
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2630
                    ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2631
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
4113
c8014ba8731a #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 4102
diff changeset
  2632
                        Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2633
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2634
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2635
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2636
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2637
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2638
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2639
            ] ifFalse:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2640
                ((whatHappened startsWith:'U ')
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2641
                or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2642
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2643
                    "/ nothing changed here, but the repository already contains
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2644
                    "/ a newer version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2645
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2646
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2647
                    self information:'nothing changed in your ''' , className , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2648
but repository already contains a newer version (repository unchanged).'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2649
                    ^ true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2650
                ] ifFalse:[
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
                    "/ unexpected
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2653
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2654
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2655
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2656
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2657
No checkin performed.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2658
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2659
                    ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2660
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2661
            ]
3265
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
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2664
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2665
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2666
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2667
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2668
        self activityNotification:'CVS: Saving ' , cls name , ' in repository...'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2669
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2670
        logMsg := logMsg replChar:$"  withString:'\"'.
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
        OperatingSystem isUNIXlike ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2673
            "/ save the log message into another tempFile ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2674
            logTmp := Filename newTemporaryIn:tempdir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2675
            s := logTmp writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2676
            s nextPutAll:logMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2677
            s close.
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
            cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2680
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2681
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2682
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2683
            "/ CVS V1.9.16 to stdout.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2684
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2685
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2686
        ].
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2687
        (self
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2688
            executeCVSCommand:cmd
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2689
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2690
            inDirectory:tempdir name
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2691
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2692
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2693
                whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2694
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2695
                whatHappened := '<< no message >>'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2696
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2697
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2698
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2699
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2700
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2701
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2702
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2703
            logTmp notNil ifTrue:[logTmp remove].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2704
            self reportError:'cannot checkin modified class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2705
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2706
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2707
        logTmp notNil ifTrue:[logTmp remove].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2708
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2709
            whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2710
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2711
            whatHappened := nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2712
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2713
    ] ensure:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  2714
        OsError handle:[:ex |
3817
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2715
            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
  2716
                        bindWith:ex description).
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2717
            ex proceed.
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2718
        ] do:[
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2719
            tempdir notNil ifTrue:[ tempdir recursiveRemove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2720
            cmdOut notNil ifTrue:[ cmdOut remove ].
fce0d1006c04 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3813
diff changeset
  2721
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2722
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2723
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2724
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2725
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2726
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2727
    (whatHappened isEmptyOrNil) ifTrue:[
3112
5ccec8607540 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3106
diff changeset
  2728
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2729
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2730
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2731
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2732
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2733
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2734
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2735
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2736
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2737
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2738
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2739
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2740
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2741
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2742
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2743
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2744
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2745
    "/   (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
  2746
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2747
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2748
    "/ 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
  2749
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2750
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2751
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
    "/    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
  2753
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2754
    newRevision notNil ifTrue:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2755
        (didMerge or:[conflictResolvedManually]) ifFalse:[
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2756
            "/ new code:
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2757
            cls revisionString notEmptyOrNil ifTrue:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2758
                newRevision isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2759
                    '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
  2760
                ] ifFalse:[
3771
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2761
                    newString := self updatedRevisionStringOf:cls forRevision:newRevision andUser:OperatingSystem getLoginName with:cls revisionString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2762
                    newString isNil ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2763
                        '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
  2764
                    ] ifFalse:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2765
                        self updateVersionMethodOf:cls for:newString.
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2766
                        cls revision ~= newRevision ifTrue:[
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2767
                            'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
c93dd51cba2e class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3754
diff changeset
  2768
                        ].
3711
2c25e442c4d2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3685
diff changeset
  2769
                    ].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2770
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2771
                self activityNotification:'Done.'.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2772
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2773
                self activityNotification:'CVS: Fetch new revision number of ', cls name.
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2774
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2775
                changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2776
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2777
                    force ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2778
                        changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
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
                ].
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2781
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2782
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2783
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2784
                ] ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2785
                    entry := (changeLog at:#revisions) first.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2786
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2787
                    self updateVersionMethodOf:cls for:newString.
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2788
                    cls revision ~= newRevision ifTrue:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2789
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  2790
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2791
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2792
            ]
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2793
        ] ifTrue:[
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2794
            "/ 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
  2795
            "/ (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
  2796
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2797
            "/ 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
  2798
            didMerge ifTrue: [
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2799
                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
  2800
                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
  2801
            ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2802
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2803
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2804
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2805
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2806
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2807
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2808
    conflictResolvedManually ifTrue:[
4075
8087475e8249 #OTHER by mawalch
mawalch
parents: 4064
diff changeset
  2809
        (Dialog
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2810
            confirm:'Now the repository contains a merge between your and the other changes.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2811
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2812
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2813
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2814
2604
e0743b3ba275 message text only
Claus Gittinger <cg@exept.de>
parents: 2601
diff changeset
  2815
I recommend doing this as soon as possible via your browser''s checkout function.'
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2816
            title:'Code Merged'
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2817
            yesLabel:'OK' noLabel:'Update (Load Merged Code)'
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2818
        ) ifFalse:[
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2819
            self utilities
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2820
                checkoutClass:cls
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2821
                askForRevision:false
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2822
                askForMerge:false
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2823
                askForConfirmation:false.
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  2824
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2825
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2826
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2827
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2828
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2829
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2830
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2831
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2832
    "Created: / 11-09-1996 / 16:16:11 / cg"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2833
    "Modified: / 26-02-1998 / 17:34:16 / stefan"
3363
b482be842bd9 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3358
diff changeset
  2834
    "Modified: / 31-07-2013 / 18:07:53 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2835
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2836
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2837
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2841
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2842
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2843
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2844
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2845
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2846
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2847
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2848
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2849
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2850
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2851
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2852
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2853
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  2854
    self activityNotification:'CVS: Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2855
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2856
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2857
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2858
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2859
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2860
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2861
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2862
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2863
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2864
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2865
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2866
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2867
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2868
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2869
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2870
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2871
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2872
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2873
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2874
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2875
            self reportError:(rslt ifTrue:['checkout failed (no dir)'] ifFalse:['failed to execute: ',cmd]).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2876
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2877
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2878
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2879
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2881
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2882
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2883
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2884
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2885
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2887
    "Created: / 23-08-2006 / 14:07:05 / cg"
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  2888
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
3866
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2891
getSourceStreamFor:aClass revision:aRevisionStringOrNil
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2892
    "extract a classes source code and return an open readStream on it.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2893
     A revision of nil selects the current (in image) revision.
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2894
     The classes source code is extracted using the revision and the sourceCodeInfo,
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2895
     which itself is extracted from the classes packageString."
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2896
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2897
    |cacheIt|
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2898
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2899
    "/ never cache symbolic versions
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2900
    cacheIt := (aRevisionStringOrNil isNil or:[ aRevisionStringOrNil first isDigit ]).
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2901
    ^ self getSourceStreamFor:aClass revision:aRevisionStringOrNil cache:cacheIt
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2902
!
854cddf9b998 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3858
diff changeset
  2903
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2904
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2905
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2906
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2907
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2910
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2912
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  2914
     classFileName cvsRoot revMsg cacheIt zArg|
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2915
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2916
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2923
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2925
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2928
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2929
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2930
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2932
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2934
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2936
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2938
    ].
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2939
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2940
        fullName := moduleDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2941
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2942
        fullName := moduleDir , '/' , packageDir , '/' , classFileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  2943
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2948
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2949
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2952
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2953
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2954
    "/ if not already existing, create a cache directory
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2955
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2956
    "/ this is used as a cache for further requests, since
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2957
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2958
    "/ (if cvs uses a remote connection via ppp, for example)
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2959
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2960
   (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2961
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2962
            ('CVSSourceCodeManager [warning]: no source cache directory for %1' bindWith:cachedSourceFilename) infoPrintCR.
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2963
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2964
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2965
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2966
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2967
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2968
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2969
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2970
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2974
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2975
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2976
    "/ Do not make module and package directories, their existence cause cvs checkout to fail in server mode
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2977
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2978
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2979
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2980
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2981
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2982
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2983
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2984
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2985
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2986
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2987
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2988
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2989
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2990
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2991
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2992
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2993
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2994
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2999
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3000
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3001
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3002
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3003
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3004
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3005
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3006
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3007
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3008
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3009
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3010
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3011
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3012
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3013
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
        ].
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3015
        zArg := ''.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3016
"/ does not work, yet ?!!?!!
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3017
"/        (cvsRoot includesString:'pserver') ifTrue:[
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3018
"/            zArg := ' -z 9'.
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3019
"/        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3020
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3021
        self activityNotification:'CVS: Checking out source ' , checkoutName , revMsg.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3022
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3023
            "/ can redirect output
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3024
            cmdOut := FileStream newTemporary 
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3025
                        close;
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3026
                        fileName.
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3027
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3028
        ] ifFalse:[
3580
c2e7385b4924 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3574
diff changeset
  3029
            cmd := 'checkout' , zArg, revisionArg , ' ', checkoutName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3030
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3031
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3032
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3033
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3034
            module:moduleDir
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3035
            inDirectory:tempdir
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3036
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3037
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  3038
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3039
"/        "/ see if there is CVS access at all ...
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3040
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3041
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3042
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3043
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3044
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3045
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3046
"/            ('CVSSourceCodeManager [warning]: disabled repository access for module ' , moduleDir) errorPrintCR.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3047
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3048
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3049
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3050
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3051
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3052
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3053
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3054
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3055
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3056
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3057
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3058
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3059
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3060
            ('CVSSourceCodeManager [error]: failed to checkout ', fullTempName pathName, ' (file does not exist after cvs co)') errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3061
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3062
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3063
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3064
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3065
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3066
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3067
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3068
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3069
                fullTempName moveTo:fullCachedName.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3070
                self activityNotification:'CVS: Cached as ',fullCachedName asFilename baseName.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3071
            ]) ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3072
                self activityNotification:'CVS: Not cached.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3073
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3074
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3075
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3076
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3077
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3078
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3079
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3080
            fileName = 'extensions.st' ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3081
                self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3082
                                                bindWith:fileName 
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3083
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3084
            ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3085
                self activityNotification:('CVS: "%1" not cached - please check your settings and/or version method in the "%2" projectDefinition.'
3386
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3086
                                                bindWith:fileName
9d613910bd78 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3383
diff changeset
  3087
                                                with:(moduleDir,':',packageDir))
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3088
            ].
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3089
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3090
            OperatingSystem isUNIXlike ifTrue:[
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3091
                stream := fullTempName readStream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3092
            ] ifFalse:[ 
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3093
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3094
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3095
                "/
3375
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3096
                stream := FileStream newTemporary.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3097
                fullTempName copyToStream:stream.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3098
                stream removeOnClose:true.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3099
                stream reset.
34ce322b5e74 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3369
diff changeset
  3100
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  3101
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3102
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3103
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  3104
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3105
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3106
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3107
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3108
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3109
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3110
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  3111
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3112
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3113
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3114
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3115
    "Created: / 04-11-1995 / 19:46:20 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3116
    "Modified: / 20-08-1997 / 16:37:11 / stefan"
2741
3914394ee4dd changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2740
diff changeset
  3117
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3118
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3120
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3121
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3122
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3123
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3124
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3125
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3126
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3127
    cvsRoot := self getCVSROOTForModule:moduleDir.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3128
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3129
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3130
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3131
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3132
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3133
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3134
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3135
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3136
    ] ifFalse:[ 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3137
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3138
    ].
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3139
    
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3140
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3141
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3143
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3146
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3147
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3148
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3149
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  3150
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3152
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3153
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3154
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3155
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3156
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3158
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  3159
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3160
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3161
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3162
    "/ cg: the code below smells - it depends upon no output being generated by cvs.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3163
    "/ (which is NOT true, as the -l flag generates a warning message (sigh).
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3164
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3165
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  3166
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3167
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3168
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3169
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  3170
        
4184
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3171
        SourceCodeManagerError handle:[:ex |
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3172
            ^ false.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3173
        ] do:[    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3174
            ret := self 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3175
                        executeCVSCommand:cmd , fullName 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3176
                        module:moduleDir 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3177
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3178
                        "/ with a different CVSRoot in its CVS/Root file ...
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3179
                        "/ cvs would complain then.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3180
                        inDirectory:(tempDir pathName) 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3181
                        log:false
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3182
                        outputTo:outputStream
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3183
                        errorTo:errorStream.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3184
    
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3185
            "cannot check for exit status starting at cvs 1.11.5, because an exit status 0
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3186
             is returned even if the file does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3187
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3188
            "But: if there is any output, the command failed and the container does not exist"
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3189
            "/ cg: read comment above.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3190
            ret2 := errorStream size == 0.
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3191
            ret2 ifFalse:[
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3192
                ret2 := (errorStream contents asCollectionOfLines 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3193
                            reject:[:l | l isBlank or:[(l includesString:'WARNING:')] ]) size == 0 
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3194
            ].
9827571f14a0 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 4182
diff changeset
  3195
        ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3197
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3198
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3199
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3200
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3203
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3204
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3205
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3208
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3209
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3210
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3213
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3214
    "Created: / 13-09-2006 / 18:20:36 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3215
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3216
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3220
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3221
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3222
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3223
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3224
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3225
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3226
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3227
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3228
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3229
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3230
    self activityNotification:'CVS: Checking for existing module ' , moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3235
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3236
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3237
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3239
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3240
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3241
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3242
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3243
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3244
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3245
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3246
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3247
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3248
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3249
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3250
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3251
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3252
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3253
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3254
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3255
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3256
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3257
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3258
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3259
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3260
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3261
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3262
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3263
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3265
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3266
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3267
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3268
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3269
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3270
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3271
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3273
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3274
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3275
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3277
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3281
    "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
  3282
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3283
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3286
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3289
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3290
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3291
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3292
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3293
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3294
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3295
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3296
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3297
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3298
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3299
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3300
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3301
    self activityNotification:'CVS: Checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3302
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3303
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3304
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3305
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3306
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3307
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3308
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3309
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3310
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3311
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3312
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3313
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3314
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3315
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3316
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3317
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3318
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3319
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3320
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3321
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3322
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3323
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3324
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3325
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3326
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3327
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3328
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3329
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3330
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3331
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3332
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3333
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3334
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3335
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3339
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3340
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3341
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3342
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3343
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3344
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3345
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3346
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3347
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3350
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3351
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3352
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3354
    "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
  3355
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3356
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3357
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3358
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3363
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
3623
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3365
    aClass isPrivate ifTrue:[
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3366
        self reportError:'refuse to check in private classes.'.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3367
        ^ false.
f193812638af class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3620
diff changeset
  3368
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3369
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3370
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3371
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3372
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3373
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3375
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3376
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3377
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3378
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3379
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3382
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3384
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3385
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3386
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3387
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3388
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3389
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3394
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3395
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3396
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3397
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3398
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3399
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3404
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3407
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3412
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3418
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3419
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3421
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3425
    self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3429
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3430
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3431
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3432
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
    cmdOut remove.
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
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3452
    self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3453
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3454
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3457
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3476
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3482
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3494
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3502
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
    "/ (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
  3541
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3558
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3569
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3570
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3571
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3586
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3587
        fullName :=  moduleDir , '/' , fileName
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3588
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3589
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  3590
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3598
    self activityNotification:'CVS: Checking for directory ' , checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3628
        self activityNotification:'CVS: Adding ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3631
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
        "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3654
        self activityNotification:'CVS: Committing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
            cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3678
                whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3691
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3703
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3711
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3734
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3740
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3741
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3753
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3754
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3755
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3756
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3757
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3773
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3774
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3793
    "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
  3794
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3795
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3796
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3797
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3798
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3799
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3807
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3808
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3809
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
        ('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
  3816
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
        ^ false.
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
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3841
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3842
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3843
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3844
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3850
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3856
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3857
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3858
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3859
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  3862
        (cmdOut contentsAsString) errorPrint.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3863
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3877
    "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
  3878
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3879
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3880
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3882
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
  3883
    "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
  3884
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3885
    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
  3886
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3887
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3888
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3889
        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
  3890
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3891
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3892
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3893
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
  3894
    "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
  3895
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3896
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3897
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
     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
  3901
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3903
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3904
    "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
  3905
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3906
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3907
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3908
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3909
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3910
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3911
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3912
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3913
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3914
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3915
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3916
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3917
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3918
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3922
    "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
  3923
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3924
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3931
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3932
    "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
  3933
     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
  3934
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3935
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3936
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  3937
    self activityNotification:'CVS: Fetching list of directories...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3938
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3939
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3940
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3941
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3942
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3943
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3944
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3945
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3946
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3947
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3948
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3949
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3950
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3951
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3952
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3953
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3954
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3955
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3956
    |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
  3957
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3958
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3959
    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
  3960
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3961
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3962
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3963
                        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
  3964
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3965
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3966
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3967
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3968
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3969
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3970
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3971
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3972
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3973
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3974
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3975
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3976
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3977
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3978
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3979
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3980
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3981
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3982
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3983
                "/ '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
  3984
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3985
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3986
                    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
  3987
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3988
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3989
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3990
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3991
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3992
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3993
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3994
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3995
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3996
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3997
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3998
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3999
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4000
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4001
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4002
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4003
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4004
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4005
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4006
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4007
     CVSSourceCodeManager listDirectories:'stx/libbasic'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4008
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4009
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4010
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4011
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4012
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4013
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4014
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4015
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4016
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4017
    self activityNotification:'CVS: Fetching list of containers...'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4018
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4019
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4020
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4021
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4022
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4023
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4024
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4025
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4026
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4027
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4028
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4029
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4030
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  4031
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4032
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4033
    "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
  4034
     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
  4035
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4036
    |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
  4037
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4038
    false "self use_rlog" ifFalse:[
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4039
         "/ 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
  4040
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4041
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4042
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4043
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4044
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4045
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4046
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4047
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4048
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4049
        info isNil ifTrue:[^ nil].
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  4050
        ^ info at:#newestRevision ifAbsent:nil 
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4051
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4052
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4053
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4054
        modulePath := moduleDir
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4055
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4056
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4057
    ].        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4058
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4059
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4060
    [
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4061
        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
  4062
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4063
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4064
                        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
  4065
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4066
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4067
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4068
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4069
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4070
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4071
            ('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
  4072
            "/ 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
  4073
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4074
                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
  4075
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4076
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4077
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4078
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4079
            "/ 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
  4080
            "/ 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
  4081
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4082
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4083
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  4084
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4085
                log:true 
4100
fcabc1395987 #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 4094
diff changeset
  4086
                outputTo:(WriteStream on:'') errorTo:(WriteStream on:'').
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4087
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4088
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4089
            "/ 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
  4090
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4091
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4092
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4093
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4094
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4095
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4096
                        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
  4097
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4098
                            (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
  4099
                                "/ 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
  4100
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4101
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4102
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4103
                        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
  4104
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4105
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4106
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4107
                                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
  4108
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4109
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4110
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4111
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4112
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4113
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4114
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4115
        ('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
  4116
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4117
        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
  4118
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4119
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4120
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4121
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4122
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4123
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  4124
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  4125
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4126
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4127
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4128
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4129
    "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
  4130
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4131
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4132
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4133
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4134
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4135
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4136
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4137
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4138
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4139
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4140
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4141
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4142
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4143
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  4144
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4145
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4146
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4147
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4148
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4149
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4150
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4151
        fullName := moduleDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4152
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4153
        fullName := moduleDir , '/' , packageDir , '/' , fileName.
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4154
    ].        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4155
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4156
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4157
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4158
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4159
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4160
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4161
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4163
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4166
    self activityNotification:'CVS: Removing ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4167
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4168
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4169
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4170
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4171
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4172
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4173
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4174
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4175
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4176
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4177
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4178
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4180
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4181
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4182
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4184
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4185
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4186
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4187
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4189
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4190
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4191
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4192
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4193
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4194
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4195
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4196
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4197
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4198
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4199
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4200
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4201
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4202
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4203
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4204
    "/
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4205
    self activityNotification:'CVS Committing removal of ' , fileName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4206
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4207
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4208
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4209
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4210
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4211
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4212
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4213
        cmdOut fileSize > 0 ifTrue:[
3583
d5264d14ecdc class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  4214
            whatHappened := cmdOut contentsAsString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4215
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4216
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4217
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4218
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4219
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4220
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4221
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4222
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4223
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4224
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4225
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4226
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4227
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4228
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4229
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4230
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4231
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4232
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4233
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4234
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4235
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4236
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4237
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4238
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4239
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4240
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4241
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4242
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4243
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4244
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4245
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4246
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4247
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4248
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4249
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4250
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4251
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4252
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4253
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4254
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4255
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4256
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4257
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4258
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4259
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4260
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4261
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4262
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4263
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4264
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4265
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4266
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4267
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4268
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4269
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4270
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4271
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4272
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4273
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4274
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4275
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4276
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4277
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4278
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4279
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4280
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4281
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4282
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4283
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4284
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4285
     filterRep may be a collection of repository names 
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4286
     (i.e. 'stx', 'exept', 'phx' etc.) to only report changes made to one
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4287
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4288
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4289
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4290
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4291
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4292
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4293
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4294
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4295
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4296
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4297
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4298
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4299
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4300
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4301
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4302
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4303
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4305
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4306
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4307
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4308
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4309
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4310
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4311
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4312
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4313
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4314
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4315
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4316
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4317
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4318
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4319
        cmd := cmd , ' history -x ARMT -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4320
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4321
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4322
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4323
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4324
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4325
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4326
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4327
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4328
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4329
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4330
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4331
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4332
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4333
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4334
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4335
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4336
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4337
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4338
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4339
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4340
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4341
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4342
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4343
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4344
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4345
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4346
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4347
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4348
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4349
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4350
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4351
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4352
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4353
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4354
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4355
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4356
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4357
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4358
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4359
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4360
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4361
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4362
                        words := line asCollectionOfWords.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4363
                        words size < 7 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4364
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4365
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4366
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4367
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4368
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4369
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4370
                            recordType = 'T' ifTrue:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4371
                                rev := words at:7.   "something like [expecco_2_8_0:HEAD]"
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4372
                                module := fileName := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4373
                                fileName := fileName copyAfterLast:$/.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4374
                            ] ifFalse:[
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4375
                                rev := words at:6.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4376
                                fileName := words at:7.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4377
                                pkgDir := words at:8.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4378
                                module := pkgDir.
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4379
                            ].
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4380
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4381
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4382
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4383
                                    time := words at:3.
3928
5fa453ae6977 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 3918
diff changeset
  4384
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4385
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4387
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4388
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4390
                                        module := module copyTo:idx-1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4391
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4394
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4399
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4400
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4401
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4416
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4417
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4421
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4422
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4423
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4424
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4425
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4426
                                                info at:#classesRevision     put:clsRev.
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
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4430
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4431
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4443
    "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
  4444
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4464
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4465
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4466
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4467
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4468
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4469
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4473
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4474
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4475
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4476
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4477
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4478
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4479
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4480
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4481
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4482
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4483
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4484
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4485
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4486
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4487
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4488
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4489
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4490
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4491
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4492
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4493
    Dialog
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4494
        modifyingBoxWith:[:box |
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4495
            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
  4496
        ] do:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4497
            "/ 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
  4498
            "/ which lead to invalid CVS strings being checked into our repository.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4499
            "/ The following repairs such corrupted revision strings 'on the fly'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4500
            "/ The repair code will be removed at some time in the future...
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4501
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4502
            "/ temporary fix Felix' bad string translation:
4384
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
  4503
            (aString startsWith:'§Header:') ifTrue:[
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
  4504
                (aString endsWith:'Exp §') ifTrue:[
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4505
                    fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4506
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4507
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4508
                        autoFixHolder value ifFalse:[
4384
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
  4509
                            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
  4510
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4511
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4512
                        (autoFixHolder value 
4384
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
  4513
                            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
  4514
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4515
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4516
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4517
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4518
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4519
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4520
4384
e28fcaaf93c7 Issue #239: Fix all Smalltak/X source files to be in unicode (UTF8 without BOM) and prefixed by "{ Encoding: utf8 }" when any unicode character is present
Patrik Svestka <patrik.svestka@gmail.com>
parents: 4330
diff changeset
  4521
            "/ 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
  4522
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4523
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4524
                    fixedString := '$' , aString , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4525
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4526
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4527
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4528
                            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
  4529
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4530
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4531
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4532
                            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
  4533
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4534
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4535
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4536
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4537
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4538
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4539
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4540
            "/ temporary fix translated (-sign) and not restored strings:
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4541
            (aString startsWith:'Header: ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4542
                (aString endsWith:'Exp ') ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4543
                    fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4544
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4545
                    aClass isNil ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4546
                        autoFixHolder value ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4547
                            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
  4548
                        ]
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4549
                    ] ifFalse:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4550
                        (autoFixHolder value 
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4551
                            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
  4552
                        ) ifTrue:[
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4553
                            self updateVersionMethodOf:aClass for:fixedString.
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4554
                        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4555
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4556
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4557
            ].
3811
777f2281af5c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3771
diff changeset
  4558
            UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4559
        ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4560
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4561
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4562
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4563
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4564
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4565
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4566
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4567
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4568
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4569
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4570
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4571
3605
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4572
revisionLogOf:clsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4573
    fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil 
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4574
    fileName:classFileName directory:packageDir module:moduleDir
30aa1a23c85d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  4575
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4576
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4577
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4578
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4579
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4580
     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
  4581
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4582
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4583
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4584
     filled with:
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4585
            #container          -> the CVS container file name 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4586
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4587
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4588
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4589
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4590
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4591
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4592
            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
  4593
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4594
              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
  4595
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4596
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4597
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4598
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4599
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4600
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4601
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4602
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4603
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4604
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4605
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4606
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4607
              #numberOfChangedLines  -> the number of changed lines w.r.t the previous (as string with +n -n)
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4608
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4609
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4610
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4611
            (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
  4612
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4613
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4614
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4615
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4616
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4617
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4618
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4619
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4620
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4621
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4622
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4623
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4624
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4625
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4626
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4627
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4628
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4629
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4630
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4631
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4632
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4633
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4634
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4635
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4636
        self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4637
            self createEntryFor:fullName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4638
                 module:moduleDir
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4639
                 in:(tempDir construct:modulePath) 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4640
                 revision:'1.1' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4641
                 date:'dummy' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4642
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4643
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4644
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4645
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4646
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4647
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4648
        (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
  4649
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4650
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4651
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4652
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4653
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4654
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4655
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4656
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4657
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4658
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4659
                    revArg := revArg , lastRevOrNil
1362
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4664
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4665
            msg := 'CVS: Fetching revision info '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4666
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4667
            msg := 'CVS: Reading revision log '
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4668
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4669
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4670
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4671
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4672
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4673
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4674
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4675
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4676
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4677
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4678
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4679
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4680
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4681
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4682
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4683
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4684
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4685
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4686
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4687
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4688
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4689
        (inStream isNil or:[inStream atEnd]) ifTrue:[
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4690
            ('CVSSourceCodeManager [error]: cannot open pipe to "cvs log" ', fullName) errorPrintCR.
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  4691
            SourceCodeManagerError raiseRequestWith:'failed to open pipe to "cvs log"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4692
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4693
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4694
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4695
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4696
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4697
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4698
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4699
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4700
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4701
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4702
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4703
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4704
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4705
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4706
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4707
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4708
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4709
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4710
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4711
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4712
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4713
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4714
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4715
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4716
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4717
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4718
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4719
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4720
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4721
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4722
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4723
                         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
  4724
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4725
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4726
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4727
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4728
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4729
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4730
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4731
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4732
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4733
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4734
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4735
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4736
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4737
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4738
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4739
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4740
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4741
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4742
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4743
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4744
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4745
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4746
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4747
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4748
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4749
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4750
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4751
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4752
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4753
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4754
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4755
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4756
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4757
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4758
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4759
                    "/ 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
  4760
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4761
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4762
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4763
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4764
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4765
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4766
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4767
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4768
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4769
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4770
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4771
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4772
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4773
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4774
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4775
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4776
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4777
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4778
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4779
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4780
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4781
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4782
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4783
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4784
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  4785
            OsError handle:[:ex |
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4786
                ('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
  4787
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4788
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4789
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4790
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4791
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4792
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4793
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4794
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4795
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4796
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4797
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4798
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4799
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4800
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4801
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4802
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4803
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4804
    "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
  4805
    "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
  4806
    "Modified: / 05-02-2012 / 19:03:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4807
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4808
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4809
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4810
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4811
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4812
     each filled with:
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4813
            #container          -> the CVS container file name 
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4814
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4815
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4816
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4817
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4818
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4819
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4820
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4821
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4822
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4823
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4824
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4825
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4826
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4827
             -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
  4828
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4829
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4830
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4831
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4832
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4833
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4834
              #state                 -> the RCS state
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  4835
              #numberOfChangedLines  -> the number of changed lines w.r.t the previous (as string with +n -n)
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4836
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4837
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4838
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4839
            (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
  4840
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4841
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4842
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4843
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4844
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4845
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4846
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4847
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4848
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4849
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4850
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4851
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4852
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4853
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4854
        packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4855
            modulePath := moduleDir 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4856
        ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4857
            modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  4858
        ].
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4859
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  4860
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4861
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4862
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4863
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4864
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4865
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4866
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4867
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4868
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4869
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4870
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4871
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4872
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4873
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4874
        headerOnly ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4875
            msg := 'CVS: Fetching revision info '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4876
        ] ifFalse:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  4877
            msg := 'CVS: Reading revision log '
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4878
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4879
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4880
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4881
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4882
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4883
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4884
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4885
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4886
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4887
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4888
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4889
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4890
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4891
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4892
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4893
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4894
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4895
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4896
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4897
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4898
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4899
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4900
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4901
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4902
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4903
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4904
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4905
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4906
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4907
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4908
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4909
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4910
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4911
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4912
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4913
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4914
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4915
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4916
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4917
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4918
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4919
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4920
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4921
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4922
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4923
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4924
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4925
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4926
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4927
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4928
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4929
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4930
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4931
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4932
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4933
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4934
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4935
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4936
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4937
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4938
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4939
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4940
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4941
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4942
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4943
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4944
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4945
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4946
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4947
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4948
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4949
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4950
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4951
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4952
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4953
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4954
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4955
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4956
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4957
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4958
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4959
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4960
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4961
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4962
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4963
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4964
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4965
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4966
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4967
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4968
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4969
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4970
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4971
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4972
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4973
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4974
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4975
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4976
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4977
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4978
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4979
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4980
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4981
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  4982
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4983
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4984
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4985
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4986
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4987
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4988
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4990
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  4991
            OsError handle:[:ex |
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4992
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4993
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4994
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4995
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4996
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4997
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4998
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4999
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5000
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5001
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5002
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5003
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5004
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  5005
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5006
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5007
    "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
  5008
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5009
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5010
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5011
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5012
    tempDir := nil.         "use the current directory"
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5013
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5014
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5015
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5016
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5017
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5018
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5019
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5020
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5021
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5022
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5023
    ].
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5024
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5025
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5026
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5027
        self activityNotification:('CVS: Fetching revision infos for %1%2'
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5028
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5029
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5030
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5031
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5032
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5033
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5034
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5035
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5036
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5037
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5038
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5039
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5040
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5041
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5042
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5043
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5044
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5045
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5046
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5047
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5048
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5049
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5050
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5051
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5052
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5053
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5054
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5055
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5056
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5057
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5058
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  5059
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5060
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5061
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5062
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5063
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5064
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5065
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5066
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5067
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5068
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5069
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5070
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  5071
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5072
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5073
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5074
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5075
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5076
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5077
3321
5dd4bd30f2e2 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3317
diff changeset
  5078
    tempDir := nil.         "use the current directory"
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5079
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5080
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5081
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5082
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5083
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5084
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5085
        modulePath := module 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5086
    ] ifFalse:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5087
        modulePath :=  module , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5088
    ].        
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5089
    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
  5090
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5091
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5092
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5093
    [
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5094
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5095
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5096
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5097
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5098
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5099
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5100
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5101
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5102
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5103
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5104
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5105
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5106
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5107
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5108
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5109
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5110
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5111
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5112
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5113
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5114
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5115
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5116
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5117
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5118
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5119
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5120
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5121
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5122
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5123
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5124
    "Created: / 12-10-2006 / 10:12:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5125
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  5126
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5127
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5128
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5129
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5130
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5131
     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
  5132
     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
  5133
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5134
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5135
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5136
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5137
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5138
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5139
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5140
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5141
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5142
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5143
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5144
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5145
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5146
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5147
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5148
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5149
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5150
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5151
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5152
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5153
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5154
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5155
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5156
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5157
     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
  5158
     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
  5159
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5160
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5161
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5162
    |paths alreadyWarned|
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5163
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5164
    alreadyWarned := 0.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5165
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5166
    paths := aCollectionOfClasses
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5167
                collect:[:cls |
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5168
                    |info path answer|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5169
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5170
                    cls isLoaded ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5171
                        Transcript showCR:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5172
                        alreadyWarned == 0 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5173
                            Dialog warn:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5174
                            alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5175
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5176
                            alreadyWarned == 1 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5177
                                answer := Dialog confirmWithCancel:('Cannot tag unloaded class: %1.\\Suppress further warnings?' withCRs bindWith:cls name).
4196
c1d94ff7867e #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4184
diff changeset
  5178
                                answer isNil ifTrue:[^ self].
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5179
                                answer == true ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5180
                                    alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5181
                                ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5182
                            ]
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5183
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5184
                        nil
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5185
                    ] ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5186
                        info := self sourceInfoOfClass:cls.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5187
                        info isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5188
                            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
  5189
                            nil
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5190
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5191
                            path := info at:#pathInRepository ifAbsent:nil.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5192
                            path isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5193
                                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
  5194
                            ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5195
                            path
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  5196
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5197
                    ].
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5198
                ]
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  5199
                thenSelect:[:path | path notNil].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5200
    self
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5201
        setSymbolicName:symbolicName
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5202
        revision:rev
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5203
        overWrite:overWriteBool
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5204
        pathes:paths
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5205
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5206
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5207
     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
  5208
     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
  5209
     self setSymbolicName:'foo' revision:nil overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5210
     self setSymbolicName:'foo' revision:'1.1' overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5211
     self setSymbolicName:'foo' revision:0 overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5212
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5213
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5214
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5215
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5216
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  5217
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
  5218
    "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
  5219
     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
  5220
     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
  5221
     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
  5222
     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
  5223
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5224
     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
  5225
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5226
    self
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5227
        setSymbolicName:symbolicName
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5228
        revision:rev
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5229
        overWrite:overWriteBool
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5230
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5231
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5232
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5233
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5234
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5235
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5236
     self setSymbolicName:'stable' revision:'1.1' overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5237
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5238
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5239
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5240
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5241
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5242
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5243
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5244
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5245
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5246
     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
  5247
     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
  5248
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5249
     If filename is nil, the symbolicName for a whole package is set.
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5250
     If multiple paths are given, the revision MUST be nil."
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5251
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5252
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5253
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5254
    symbolicName := (symbolicNameArg includes:Character space)
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5255
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5256
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5257
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5258
    pathesInRepository size > 1 ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5259
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5260
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5261
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5262
    moduleDirs := pathesInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5263
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5264
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5265
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5266
    moduleDirs do:[:moduleDir |
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5267
        |pathsInModule pathsInModuleAsArgument|
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5268
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5269
        pathsInModule := pathesInRepository
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5270
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5271
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5272
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5273
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5274
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5275
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5276
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5277
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5278
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5279
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5280
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5281
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5282
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5283
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5284
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5285
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5286
        pathsInModuleAsArgument := pathsInModule
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5287
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5288
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5289
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5290
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5291
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5292
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5293
                                        ].
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5294
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5295
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5296
        self activityNotification:('CVS: Setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathsInModuleAsArgument).
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5297
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5298
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5299
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5300
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5301
        result := self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5302
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathsInModuleAsArgument)
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5303
                    module:moduleDir
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5304
                    inDirectory:nil
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5305
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5306
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5307
                    errorTo:errorStream.
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5308
        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
  5309
        (result not or:[errorStream size ~~ 0]) ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5310
            SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5311
        ] ifFalse:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5312
            (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5313
                SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathsInModuleAsArgument.
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5314
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5315
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5316
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5317
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5318
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5319
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5320
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5321
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5322
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5323
        setSymbolicName:'test1'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5324
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5325
        overWrite:true
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5326
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5327
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5328
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5329
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5330
        revision:nil
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5331
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5332
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5333
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5334
4084
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5335
     self
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5336
        setSymbolicName:'test2'
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5337
        revision:0
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5338
        overWrite:true
d39ce0820079 #OTHER by mawalch
mawalch
parents: 4075
diff changeset
  5339
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5340
                  '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
  5341
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5342
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5343
    "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
  5344
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5345
3931
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5346
standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5347
    "utility function: return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5348
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5349
    ^ 'Header: %1/%2/%3,v %4, %5 %6 %7 Exp'
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5350
        bindWith:moduleDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5351
        with:packageDir
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5352
        with:fileName
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5353
        with:revisionString
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5354
        with:(Date today printStringFormat:'%y/%m/%d')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5355
        with:(Time now printStringFormat:'%h:%m:%s')
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5356
        with:(OperatingSystem getLoginName)
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5357
        
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5358
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5359
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5360
     self 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5361
        revisionStringFor:Array 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5362
        inModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5363
        directory:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5364
        container:'Array.st' 
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5365
        revision:'123'          
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5366
    "
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5367
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5368
    "Created: / 23-07-2012 / 18:46:29 / cg"
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5369
!
Claus Gittinger <cg@exept.de>
parents: 3928
diff changeset
  5370
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5371
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3649
0abe295fab70 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3626
diff changeset
  5372
    "return info about the status of a repository container.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5373
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5374
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5375
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5376
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5377
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5378
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5379
     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
  5380
     and all we need is a class's newest version number."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5381
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5382
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5383
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5384
4055
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5385
    packageDir isEmptyOrNil ifTrue:[
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5386
        modulePath :=  moduleDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5387
    ] ifFalse:[        
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5388
        modulePath :=  moduleDir , '/' , packageDir. 
eeb8d1ac4eec #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 4048
diff changeset
  5389
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5390
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5391
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5392
    tempDir isNil ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5393
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5394
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5395
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5396
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5397
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5398
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5399
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5400
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5401
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5402
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5403
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5404
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5405
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5406
        msg := 'CVS: fetching status info of '.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5407
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5408
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5409
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5410
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5411
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5412
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5413
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5414
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5415
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5416
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5417
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5418
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5419
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5420
3677
48ba20422b8d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3659
diff changeset
  5421
        (inStream isNil or:[inStream atEnd]) ifTrue:[
3322
04127f10c007 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3321
diff changeset
  5422
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs status ', fullName) errorPrintCR.
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5423
            SourceCodeManagerError raiseRequestErrorString:'failed to open pipe to "cvs status"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5424
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5425
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5426
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5427
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5428
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5429
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5430
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5431
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5432
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5433
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5434
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5435
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5436
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5437
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5438
3834
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5439
                ((line includesString:'warning')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5440
                and:[ (line includesString:'is not')
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5441
                and:[ (line includesString:'pertinent') ]]) ifTrue:[
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5442
                    ^ nil
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5443
                ].
c0b686ad7925 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
  5444
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5445
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5446
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5447
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5448
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5449
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5450
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5451
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5452
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5453
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5454
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5455
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5456
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5457
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5458
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5459
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5460
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5461
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5462
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5463
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5464
        info isEmpty ifTrue:[
3870
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5465
            ('CVSSourceCodeManager [warning]: no status for "', fullName,'"') errorPrintCR.
1a505457a2e2 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3866
diff changeset
  5466
            SourceCodeManagerError raiseRequestErrorString:'no status for "', fullName,'"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5467
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5468
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5469
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5470
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5471
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5472
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5473
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5474
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5475
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5476
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5477
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5478
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5479
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5480
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5481
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5482
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5483
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5484
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5485
!CVSSourceCodeManager class methodsFor:'source code utilities'!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5486
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5487
annotationsFor:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5488
    "return info about who changed what and when.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5489
     Return nil on failure.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5490
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5491
     The returned information is a structure entry for each line
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5492
            #revision           -> version of last change
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5493
            #author             -> author 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5494
            #date               -> change date 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5495
        "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5496
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5497
    |tempDir fullName modulePath inStream inHeaderInfo line info msg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5498
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5499
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5500
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5501
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5502
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5503
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5504
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5505
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5506
        |cmd revArg|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5507
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5508
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5509
        fullName :=  modulePath , '/' , classFileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5510
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5511
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5512
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5513
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5514
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5515
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5516
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5517
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5518
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5519
        msg := 'Fetching annotation log '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5520
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5521
            msg := msg , 'in ' , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5522
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5523
            msg := msg , 'of ', clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5524
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5525
        self activityNotification:msg,'...'.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5526
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5527
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5528
                        executeCVSCommand:('annotate ' , fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5529
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5530
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5531
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5532
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5533
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5534
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5535
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs annotate ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5536
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5537
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5538
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5539
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5540
        "/ read the commands pipe output and extract the info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5541
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5542
        info := IdentityDictionary new.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5543
        inHeaderInfo := true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5544
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5545
            line:= inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5546
            ((line ? '') startsWith:'*******') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5547
                inHeaderInfo := false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5548
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5549
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5550
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5551
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5552
        "/ continue to read the commands pipe output 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5553
        "/ and extract change info records
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5554
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5555
        [inStream atEnd] whileFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5556
            line := inStream nextLine.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5557
Transcript showCR:line.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5558
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5559
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5560
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5561
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5562
        tempDir notNil ifTrue:[
4164
640b3d01efb9 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 4157
diff changeset
  5563
            OsError handle:[:ex |
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5564
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5565
            ] do:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5566
                tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5567
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5568
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5569
        self activityNotification:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5570
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5571
    ^ info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5572
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5573
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5574
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5575
        annotationsFor:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5576
        fileName:'Array.st' directory:'libbasic' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5577
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5578
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5579
     SourceCodeManager 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5580
        annotationsFor:MenuPanel 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5581
        fileName:'MenuPanel.st' directory:'libwidg2' module:'stx'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5582
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5583
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5584
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5585
diffListFor:clsOrNil fileName:classFileNameArg directory:packageDir module:moduleDir revision1:rev1 revision2:rev2 cache:cacheIt
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5586
    "return diff info. This is supposed to return a standard diff-like
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5587
     list of lines, representing the diffs between two revisions.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5588
     experimental (for ownershipGraph).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5589
     Here we ask cvs to give us the diff list"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5590
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5591
    |tempDir fullName modulePath inStream list msg cacheDir cachedFile classFileName diffDir|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5592
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5593
    clsOrNil notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5594
        modulePath :=  clsOrNil package copyReplaceAll:$: with:$/.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5595
        fullName :=  modulePath , '/' , (classFileName := clsOrNil getClassFilename).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5596
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5597
        modulePath :=  moduleDir , '/' , packageDir. 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5598
        fullName :=  modulePath , '/' , (classFileName := classFileNameArg).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5599
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5600
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5601
   (cacheIt) ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5602
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5603
            ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5604
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5605
            diffDir := (cacheDir / modulePath / '.diffs').
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5606
            diffDir exists ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5607
                diffDir makeDirectory.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5608
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5609
            cachedFile := diffDir / (classFileName,'_',rev1,'_',rev2).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5610
            cachedFile exists ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5611
                ^ cachedFile contents
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5612
            ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5613
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5614
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5615
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5616
    tempDir := self createTempDirectory:nil forModule:nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5617
    tempDir isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5618
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract status') errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5619
        ^ nil.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5620
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5621
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5622
    [
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5623
        self createEntryFor:fullName 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5624
             module:moduleDir
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5625
             in:(tempDir construct:modulePath) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5626
             revision:'1.1' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5627
             date:'dummy' 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5628
             special:''
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5629
             overwrite:false.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5630
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5631
        msg := 'CVS: Fetching diff list of '.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5632
        clsOrNil isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5633
            msg := msg , fullName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5634
        ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5635
            msg := msg , clsOrNil name.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5636
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5637
        msg := msg , ' ' , rev1 , ' vs. ' , rev2.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5638
        self activityNotification:msg.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5639
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5640
        inStream := self 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5641
                        executeCVSCommand:('diff -w -r%1 -r%2 %3' bindWith:rev1 with:rev2 with:fullName) 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5642
                        module:moduleDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5643
                        inDirectory:tempDir 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5644
                        log:true 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5645
                        pipe:true.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5646
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5647
        inStream isNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5648
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs diff ', fullName) errorPrintCR.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5649
            ^ nil
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5650
        ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5651
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5652
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5653
        "/ read the command's pipe output, skipping some administrative info
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5654
        "/
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5655
        [ inStream nextLine startsWith:'diff -'] whileFalse.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5656
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5657
        list := inStream contents.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5658
    ] ensure:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5659
        inStream notNil ifTrue:[inStream close].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5660
        tempDir recursiveRemove
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5661
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5662
    list := list reject:[:line | line startsWith:'\ '].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5663
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5664
    cachedFile notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5665
        cachedFile contents:list.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5666
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5667
    ^ list
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5668
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5669
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5670
     SourceCodeManager statusOf:Array 
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5671
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5672
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5673
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5674
    "
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5675
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5676
    "Modified: / 29-08-2006 / 13:18:00 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5677
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5678
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5679
initialRCSRevisionStringFor:aClass in:dir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5680
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5681
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5682
    "/ do not make the string below into one string;
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5683
    "/ RCS would expand it into a wrong rev-string
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5684
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5685
    |nm oldRev idx special|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5686
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5687
    nm := fileName.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5688
    (nm endsWith:',v') ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5689
        nm := nm copyButLast:2
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5690
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5691
    (nm endsWith:'.st') ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5692
        nm := nm , '.st'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5693
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5694
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5695
    oldRev := aClass revisionString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5696
    special := ''.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5697
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5698
    oldRev notNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5699
        idx := oldRev lastIndexOf:$[.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5700
        idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5701
            idx := oldRev indexOf:$[ startingAt:idx+1.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5702
            idx ~~ 0 ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5703
                special := ' ' , (oldRev copyFrom:idx).
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5704
            ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5705
        ]
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5706
    ].
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5707
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5708
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5709
    ^ '$' , 'Header: ' , dir , '/' , fileName , ',v $'
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5710
      , special
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5711
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5712
    "Modified: 17.9.1996 / 15:57:15 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5713
    "Created: 14.2.1997 / 20:59:28 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5714
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5715
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5716
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5717
    "return a string usable as initial revision string"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5718
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5719
    |cvsRoot fullName|
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5720
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5721
    cvsRoot := self getCVSROOTForModule:moduleDir.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5722
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5723
    packageDir isEmptyOrNil ifTrue:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5724
        fullName := (cvsRoot , '/' , moduleDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5725
    ] ifFalse:[
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5726
        fullName := (cvsRoot , '/' , moduleDir , '/' , packageDir)
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5727
    ].        
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5728
    ^ self initialRCSRevisionStringFor:aClass in:fullName container:fileName
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5729
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5730
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5731
    "Created: / 23-08-2006 / 14:05:46 / cg"
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5732
! !
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5733
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5734
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5735
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5736
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5737
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5738
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5739
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5740
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5741
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5742
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'documentation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5743
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5744
copyright
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5745
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5746
 COPYRIGHT (c) 2009 by eXept Software AG
4330
998eb03f0736 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4207
diff changeset
  5747
 COPYRIGHT (c) 2015 Jan Vrany
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5748
              All Rights Reserved
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5749
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5750
 This software is furnished under a license and may be used
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5751
 only in accordance with the terms of that license and with the
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5752
 inclusion of the above copyright notice.   This software may not
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5753
 be provided or otherwise made available to, or used by, any
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5754
 other person.  No title to or ownership of the software is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5755
 hereby transferred.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5756
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5757
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5758
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5759
documentation
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5760
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5761
    In ancient times, Class used to return a Dictionary when asked for versionInfo.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5762
    This has been replaced by instances of VersionInfo and subclasses.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5763
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5764
    CVSVersionInfo adds some CVS specific data.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5765
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5766
    [author:]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5767
        cg (cg@AQUA-DUO)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5768
"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5769
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5770
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5771
version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5772
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5773
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5774
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5775
version_CVS
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5776
    ^ '$Header$'
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5777
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5778
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5779
!CVSSourceCodeManager::CVSVersionInfo class methodsFor:'instance creation'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5780
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5781
fromRCSString:aString
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5782
    "{ Pragma: +optSpace }"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5783
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5784
    "I know how to parse RCS/CVS version id strings.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5785
     Return an instance filled with revision info which is
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5786
     extracted from aString. This must be in RCS/CVS format."
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5787
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5788
    |words firstWord nextWord info nm s fn revString d |
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5789
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5790
    s := aString readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5791
    s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5792
    firstWord := s upToSeparator.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5793
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5794
    info := self new.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5795
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5796
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5797
    "/ supported formats:
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5798
    "/
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5799
    "/ $-Header:   pathName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5800
    "/ $-Revision: rev $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5801
    "/ $-Id:       fileName rev date time user state $
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5802
    "/
4186
HG Automerge
parents: 4185 4182
diff changeset
  5803
    (firstWord = '$Header:' or:[firstWord = 'Header:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5804
        d := firstWord first.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5805
        s skipSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5806
        nm := s throughAll:',v '.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5807
        nm := nm withoutSeparators.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5808
        info repositoryPathName:nm.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5809
        info fileName:(nm asFilename baseName copyButLast:2).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5810
        words := s upToEnd asCollectionOfWords readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5811
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5812
        words atEnd ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5813
            nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5814
            nextWord first ~= d ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5815
                info revision:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5816
                nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5817
                (nextWord notNil and:[nextWord first ~= d]) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5818
                    info date:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5819
                    info time:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5820
                    nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5821
                    (nextWord notNil and:[nextWord startsWithAnyOf:'+-']) ifTrue:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5822
                        info timezone:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5823
                        nextWord := words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5824
                    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5825
                    info user:nextWord.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5826
                    info state:words next.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5827
                ]
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5828
            ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5829
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5830
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5831
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5832
4186
HG Automerge
parents: 4185 4182
diff changeset
  5833
    (firstWord = '$Revision:' or:[firstWord = 'Revision:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5834
        info revision:(s upToEnd asCollectionOfWords first).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5835
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5836
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5837
4186
HG Automerge
parents: 4185 4182
diff changeset
  5838
    (firstWord = '$Id:' or:[firstWord = 'Id:']) ifTrue:[
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5839
        "/commented out by Jan Vrany, 2009/10/20
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5840
        "/according to http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5841
        "/svn has no support for $ Header $ expansion. Therefore
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5842
        "/libsvn uses $Id$ instead.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5843
        "/self halt:'no longer supported'.        
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5844
        words := s upToEnd asCollectionOfWords readStream.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5845
        info fileName:(fn := words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5846
        (fn endsWith:',v') ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5847
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5848
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5849
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5850
        info revision:(revString := words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5851
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5852
        "/ do not use matchesRegex:'[0-9]+\.[0-9]+.*') here: regex is an optional package
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5853
        ((revString conform:[:c | c isDigit or:[c == $.]])
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5854
        and:[revString includes:$.]) ifFalse:[
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5855
            "/ not a CVS version
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5856
            ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5857
        ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5858
        info date:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5859
        info time:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5860
        info user:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5861
        info state:(words next).
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5862
        ^ info
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5863
    ].
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5864
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5865
    ^ nil
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5866
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5867
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5868
     CVSVersionInfo fromRCSString:('$' , 'Revision: 1.122 $')
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5869
     CVSVersionInfo fromRCSString:(CVSSourceCodeManager version)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5870
     CVSVersionInfo fromRCSString:(SVNSourceCodeManager version_CVS)
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5871
    "
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5872
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5873
    "Modified (comment): / 11-10-2011 / 23:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5874
    "Modified: / 22-11-2011 / 16:15:49 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5875
    "Modified (format): / 24-11-2011 / 10:56:51 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5876
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5877
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5878
!CVSSourceCodeManager::CVSVersionInfo methodsFor:'accessing'!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5879
4157
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5880
changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5881
    ^ changedLinesInfo
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5882
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5883
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5884
changedLinesInfo:aString
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5885
    changedLinesInfo := aString.
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5886
!
3eb587af122a #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4144
diff changeset
  5887
4144
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5888
repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5889
    ^ repositoryPathName
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5890
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5891
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5892
repositoryPathName:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5893
    repositoryPathName := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5894
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5895
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5896
timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5897
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5898
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5899
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5900
timeZone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5901
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5902
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5903
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5904
timezone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5905
    ^ timeZone
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5906
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5907
    "Created: / 22-10-2008 / 20:50:39 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5908
!
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5909
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5910
timezone:something
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5911
    timeZone := something.
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5912
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5913
    "Created: / 22-10-2008 / 20:50:32 / cg"
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5914
! !
f06214e8e084 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4113
diff changeset
  5915
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5916
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5917
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5918
version
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5919
    ^ '$Header$'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5920
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5921
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5922
version_CVS
3890
eace6f830e68 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3870
diff changeset
  5923
    ^ '$Header$'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5924
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5925
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  5926
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5927
CVSSourceCodeManager initialize!