author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Tue, 08 Jan 2019 09:35:11 +0000 | |
changeset 866 | 8a885a75daa9 |
parent 864 | c854577212b8 |
child 914 | 04391080b32d |
permissions | -rw-r--r-- |
864
c854577212b8
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:
549
diff
changeset
|
1 |
"{ Encoding: utf8 }" |
c854577212b8
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:
549
diff
changeset
|
2 |
|
44 | 3 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
4 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
472
diff
changeset
|
5 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
6 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
7 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
8 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
9 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
10 |
version 2.1 of the License. |
44 | 11 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
12 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
13 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
14 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
15 |
Lesser General Public License for more details. |
44 | 16 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
17 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
18 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
19 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
44 | 20 |
" |
21 |
"{ Package: 'stx:libscm/common' }" |
|
22 |
||
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
23 |
"{ NameSpace: Smalltalk }" |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
24 |
|
44 | 25 |
SCMAbstractFileoutLikeTask subclass:#SCMAbstractCommitTask |
26 |
instanceVariableNames:'message paths' |
|
27 |
classVariableNames:'' |
|
28 |
poolDictionaries:'' |
|
29 |
category:'SCM-Common-StX-Tasks' |
|
30 |
! |
|
31 |
||
32 |
!SCMAbstractCommitTask class methodsFor:'documentation'! |
|
33 |
||
34 |
copyright |
|
35 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
36 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
472
diff
changeset
|
37 |
Copyright (C) 2012-2015 Jan Vrany |
44 | 38 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
39 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
40 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
41 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
42 |
version 2.1 of the License. |
44 | 43 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
44 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
45 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
46 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
47 |
Lesser General Public License for more details. |
44 | 48 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
49 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
50 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
51 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
44 | 52 |
" |
53 |
! ! |
|
54 |
||
55 |
!SCMAbstractCommitTask methodsFor:'accessing'! |
|
56 |
||
57 |
message |
|
408
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
58 |
"Returns initial commit message" |
44 | 59 |
|
408
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
60 |
"/ NO, do not generate commit message based on changes in code. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
61 |
"/ Such commit message is completely useless!! |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
62 |
^ '' |
44 | 63 |
|
408
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
64 |
"/ message isNil ifTrue:[ |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
65 |
"/ self isPackageCommit ifTrue:[ |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
66 |
"/ message := String streamContents: [:s| |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
67 |
"/ | klasses methods msg | |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
68 |
"/ klasses := OrderedCollection streamContents:[:s|packages do:[:each | s nextPutAll: (self classesToFileOutFor: each) ]]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
69 |
"/ methods := OrderedCollection streamContents:[:s|packages do:[:each | s nextPutAll: (self extensionMethodsToFileOutFor: each) ]]. . |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
70 |
"/ klasses do:[:cls| |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
71 |
"/ msg := SCMAbstractSourceCodeManager utilities goodInitialLogMessageForCheckinClassOfClass:cls. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
72 |
"/ msg notEmptyOrNil ifTrue: [ |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
73 |
"/ s nextPutAll: ' - '; nextPutLine: cls name. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
74 |
"/ msg asStringCollection do:[:line| |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
75 |
"/ s nextPutAll:' '; nextPutLine: line. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
76 |
"/ ] |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
77 |
"/ ]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
78 |
"/ ]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
79 |
"/ methods notEmptyOrNil ifTrue:[ |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
80 |
"/ s nextPutLine: ' - extensions'. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
81 |
"/ s nextPutLine: ' ...'. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
82 |
"/ ]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
83 |
"/ ] |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
84 |
"/ ]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
85 |
"/ ]. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
86 |
"/ ^message. |
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
87 |
|
9b24602affa1
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
88 |
"Modified: / 26-03-2014 / 15:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 89 |
! |
90 |
||
91 |
message:aString |
|
92 |
message := aString. |
|
93 |
! |
|
94 |
||
95 |
paths |
|
96 |
^ paths |
|
97 |
! |
|
98 |
||
99 |
paths:aCollection |
|
100 |
paths := aCollection. |
|
101 |
! ! |
|
102 |
||
103 |
!SCMAbstractCommitTask methodsFor:'executing'! |
|
104 |
||
105 |
do |
|
106 |
self |
|
107 |
doPrepareWorkingCopy; |
|
108 |
doCommit |
|
109 |
||
110 |
"Created: / 23-03-2009 / 11:15:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
111 |
"Modified: / 17-06-2009 / 10:16:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
112 |
! |
|
113 |
||
114 |
doCommit |
|
56
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
115 |
|containers commitLabel msg | |
44 | 116 |
|
117 |
msg := ((message ? '<no commit message>') asStringCollection |
|
118 |
reject: [:line|line size >= 2 and:[line first == $# and:[line second == $#]]]) |
|
119 |
asString. |
|
120 |
||
121 |
self do:[ |
|
122 |
self isPackageCommit ifFalse:[ |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
123 |
paths notEmptyOrNil ifTrue:[ |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
124 |
commitLabel := paths size > 2 |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
125 |
ifTrue:[((paths upTo: 2) asStringWith:', ') , (' and %1 others' bindWith: paths size - 3)] |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
126 |
ifFalse:[paths asStringWith:', ']. |
44 | 127 |
] ifFalse:[ |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
128 |
commitLabel := temporaryWorkingCopy pathName. |
44 | 129 |
]. |
130 |
containers := paths |
|
131 |
] ifTrue:[ |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
132 |
commitLabel := (paths isEmptyOrNil or:[paths size > 2]) |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
133 |
ifTrue:[packages size == 1 ifTrue:[ packages anElement name ] ifFalse:[ packages first name , ', ...' ]] |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
134 |
ifFalse:[paths asStringWith:', ']. |
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
135 |
containers := self containersToCommit. |
44 | 136 |
]. |
72
66345356fa65
Fix in SCMAbstractCommitTask>>doCommit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
68
diff
changeset
|
137 |
(containers isNil or:[containers notEmpty]) ifTrue: [ |
60 | 138 |
ActivityNotification notify:'Commiting ' , commitLabel. |
139 |
self doCommit: msg files: containers. |
|
140 |
]. |
|
56
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
141 |
ActivityNotification notify:'Shrinking changes'. |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
142 |
self isPackageCommit ifTrue:[ |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
143 |
self doShrinkChanges. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
144 |
]. |
44 | 145 |
]. |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
146 |
self isPackageCommit ifTrue:[ |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
147 |
packages do:[:each | each isVirtual ifFalse: [ each commited ] ] |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
148 |
]. |
44 | 149 |
|
150 |
"Created: / 11-04-2008 / 09:20:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
151 |
"Modified: / 19-08-2009 / 12:27:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
152 |
"Modified: / 14-03-2012 / 17:42:25 / jv" |
|
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
153 |
"Modified: / 11-06-2015 / 07:15:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
56
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
154 |
! |
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
155 |
|
44 | 156 |
doPrepareWorkingCopy |
157 |
||
158 |
self doPrepareWorkingCopy1. |
|
159 |
self doPrepareWorkingCopy2. |
|
160 |
||
161 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
162 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
163 |
"Modified: / 07-10-2012 / 09:32:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
164 |
! |
|
165 |
||
166 |
doPrepareWorkingCopy1 |
|
167 |
||
168 |
self isPackageCommit ifTrue:[ |
|
169 |
self do:[ |
|
170 |
self doUpdateCode. |
|
171 |
] |
|
172 |
]. |
|
173 |
||
174 |
"Created: / 10-05-2012 / 17:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
175 |
! |
|
176 |
||
177 |
doPrepareWorkingCopy2 |
|
178 |
||
179 |
self isPackageCommit ifTrue:[ |
|
180 |
self do:[ |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
181 |
| p | |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
182 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
183 |
p := packages anElement. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
184 |
p ensureTemporaryWorkingCopy. |
44 | 185 |
self doFileOut |
186 |
] |
|
187 |
]. |
|
188 |
||
189 |
"Created: / 10-05-2012 / 17:08:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
190 |
"Modified: / 21-02-2014 / 23:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
191 |
! ! |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
192 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
193 |
!SCMAbstractCommitTask methodsFor:'executing-private'! |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
194 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
195 |
doCommit: msg files: containers |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
196 |
"Actually commit the changes, To be overridden by subclasses" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
197 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
198 |
self synchronized:[ |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
199 |
self halt: 'Have to be smart here!!!!!!'. |
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
200 |
self package workingCopy commit: msg files: containers. |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
201 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
202 |
"/ "Update the working copy. We need svn info |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
203 |
"/ to report commited revision" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
204 |
"/ (UpdateCommand new) |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
205 |
"/ workingCopy:self workingCopy; |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
206 |
"/ execute |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
207 |
]. |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
208 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
209 |
"Created: / 15-11-2012 / 09:39:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
210 |
"Modified: / 21-02-2014 / 23:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 211 |
! |
212 |
||
213 |
doSanityChecks |
|
214 |
"Perform some sanity checks on the package |
|
215 |
(or individual classes and/or methods). |
|
216 |
Return a project checker. Use #problems to get the |
|
217 |
list of problems" |
|
218 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
219 |
| checker | |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
220 |
|
44 | 221 |
self isPackageCommit ifFalse:[ ^ nil ]. |
222 |
(ConfigurableFeatures includesFeature:#ProjectChecker) ifFalse:[ ^ nil ]. |
|
223 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
224 |
checker := ProjectChecker new. |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
225 |
packages do:[:each | each isVirtual ifFalse: [ checker package: each name ] ]. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
226 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
227 |
checker |
44 | 228 |
classes: classes; |
229 |
methods: (extensionMethods = #() ifTrue:[nil] ifFalse:[extensionMethods]); |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
230 |
check. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
231 |
^ checker |
44 | 232 |
|
233 |
"Created: / 11-04-2008 / 09:19:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
234 |
"Modified: / 17-08-2009 / 18:28:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
235 |
"Created: / 13-02-2012 / 16:36:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
236 |
"Modified: / 27-02-2014 / 22:54:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
56
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
237 |
! |
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
238 |
|
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
239 |
doShrinkChanges |
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
240 |
|
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
241 |
"Do this only iff this is a package commit" |
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
242 |
self isPackageCommit ifTrue:[ |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
243 |
packages do:[:each | |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
244 |
each isVirtual ifFalse: [ |
471
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
245 |
self doShrinkChangesFor: each. |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
246 |
] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
247 |
] |
56
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
248 |
]. |
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
249 |
|
c183805e5eb1
Few hacks to make Mercurial commits working.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
250 |
"Created: / 15-11-2012 / 09:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
471
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
251 |
"Modified: / 15-11-2014 / 00:37:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
252 |
! |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
253 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
254 |
doShrinkChangesFor: package |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
255 |
paths isNil ifTrue:[ |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
256 |
(ChangeSet current) |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
257 |
condenseChangesForPackageAfterCommit:package name; |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
258 |
condenseChangesForExtensionsInPackage:package name; |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
259 |
flushChangedClassesCache; |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
260 |
yourself. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
261 |
] ifFalse:[ |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
262 |
| root commitedClasses commitedExtensions | |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
263 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
264 |
"/ paths is list of !!!!!!absolute filenames!!!!!!, so we have to construct full name |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
265 |
"/ furtunately, that's easy... |
472
e037e301b4e5
Fixes for #24: Session ChangeSet compression after a commit is broken [2/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
471
diff
changeset
|
266 |
root := package temporaryWorkingCopyRoot asFilename. |
471
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
267 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
268 |
commitedClasses := Set new. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
269 |
package classes do:[:class | |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
270 |
| container | |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
271 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
272 |
container := (root / (package containerNameForClass: class)) pathName. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
273 |
(paths includes: container) ifTrue:[ |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
274 |
commitedClasses add: class. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
275 |
]. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
276 |
]. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
277 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
278 |
commitedExtensions := #(). |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
279 |
(paths includes: ((root / package containerNameForExtensions) pathName)) ifTrue:[ |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
280 |
commitedExtensions := package extensions. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
281 |
]. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
282 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
283 |
commitedClasses do:[:each | |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
284 |
ChangeSet current condenseChangesForClass: each. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
285 |
]. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
286 |
commitedExtensions do:[:each | |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
287 |
ChangeSet current condenseChangesForClass: each mclass selector: each selector. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
288 |
] |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
289 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
290 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
291 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
292 |
]. |
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
293 |
|
44664f7f71c5
Fixes for #24: Session ChangeSet compression after a commit is broken [1/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
408
diff
changeset
|
294 |
"Created: / 15-11-2014 / 00:37:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
472
e037e301b4e5
Fixes for #24: Session ChangeSet compression after a commit is broken [2/3]
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
471
diff
changeset
|
295 |
"Modified: / 16-11-2014 / 08:47:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 296 |
! ! |
297 |
||
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
298 |
!SCMAbstractCommitTask methodsFor:'private'! |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
299 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
300 |
containersToCommit |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
301 |
"Return a list of containers (paths) that should be commited. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
302 |
nil return value means 'all modified files' " |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
303 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
304 |
| containers | |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
305 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
306 |
paths notEmptyOrNil ifTrue:[ ^ paths ]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
307 |
self isSelectiveFileoutTask ifFalse: [ ^ nil ]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
308 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
309 |
containers := OrderedCollection withAll: self containersToFileOut. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
310 |
packages do:[:package | |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
311 |
(classes includes: package definition) ifTrue:[ |
549
50ead1eda69b
Fix for selective commit of a new Java class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
548
diff
changeset
|
312 |
(self filesToGenerateFor: package skipNotOverwritable: false) do:[:each | |
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
313 |
| container | |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
314 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
315 |
container := package containerFor: each. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
316 |
(container exists and:[container isModified or:[ container isAdded ]]) ifTrue:[ |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
317 |
containers add: container pathNameRelative |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
318 |
]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
319 |
]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
320 |
]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
321 |
]. |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
322 |
^ containers |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
323 |
|
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
324 |
"Created: / 11-06-2015 / 07:14:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
549
50ead1eda69b
Fix for selective commit of a new Java class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
548
diff
changeset
|
325 |
"Modified: / 11-06-2015 / 08:20:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
548
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
326 |
! ! |
cfbdb28f0fc7
Update project definition when selective commit adds class.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
327 |
|
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
328 |
!SCMAbstractCommitTask methodsFor:'queries'! |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
329 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
330 |
isCommitingAllChangedPackages |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
331 |
"Return true, if package group contain all changed packages |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
332 |
of given repository, false otherwise." |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
333 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
334 |
^ packages containsAllChangedPackages |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
335 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
336 |
"Created: / 03-03-2014 / 00:12:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
337 |
! ! |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
338 |
|
44 | 339 |
!SCMAbstractCommitTask methodsFor:'testing'! |
340 |
||
341 |
isPackageCommit |
|
342 |
"Returns true iff this task is for a package |
|
343 |
(or part of it). False if this is ad-hoc commit task - |
|
344 |
for example ad-hoc commit from a file browser" |
|
345 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
346 |
^ packages notEmpty" and:[paths isEmptyOrNil]" |
44 | 347 |
|
348 |
"Modified: / 14-03-2012 / 17:27:17 / jv" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
349 |
"Modified: / 21-02-2014 / 22:54:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 350 |
! ! |
351 |
||
352 |
!SCMAbstractCommitTask class methodsFor:'documentation'! |
|
353 |
||
354 |
version_GIT |
|
355 |
"Never, ever change this method. Ask JV or CG why" |
|
356 |
^thisContext method mclass theNonMetaclass instVarNamed: #revision |
|
357 |
! |
|
358 |
||
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
359 |
version_HG |
114
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
360 |
|
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
361 |
^ '$Changeset: <not expanded> $' |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
362 |
! |
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
363 |
|
44 | 364 |
version_SVN |
864
c854577212b8
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:
549
diff
changeset
|
365 |
^ '§Id:: §' |
44 | 366 |
! ! |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
122
diff
changeset
|
367 |