author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 21 Mar 2012 15:07:18 +0100 | |
changeset 1074 | 6ecaa17c456c |
parent 1073 | 919f9b609bcd |
child 1076 | 458325a28f8e |
permissions | -rw-r--r-- |
516 | 1 |
"{ Package: 'stx:libsvn' }"! |
102 | 2 |
|
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
3 |
!AbstractFileBrowser methodsFor:'menu-queries-svn'! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
4 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
5 |
canSubversionMerge |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
6 |
"Return true, if file is in conflict an can be merged" |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
7 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
8 |
| files | |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
9 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
10 |
files := self currentSelectedFiles. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
11 |
files size ~~ 1 ifTrue:[ ^ false ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
12 |
self svnMergeFilesFor: files anElement do:[:base :wc :merge :output| ^ true ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
13 |
^false |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
14 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
15 |
"Modified: / 20-03-2012 / 15:50:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
16 |
! ! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
17 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
18 |
!AbstractFileBrowser methodsFor:'menu-queries-svn'! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
19 |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
20 |
canSubversionMergeAuto |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
21 |
"Return true, if file is in conflict an can be merged" |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
22 |
|
1073 | 23 |
| files | |
24 |
||
25 |
files := self currentSelectedFiles copy. |
|
26 |
files isEmptyOrNil ifTrue:[ |
|
27 |
files := self currentDirectory directoryContentsAsFilenames select:[:e|e isRegularFile]. |
|
28 |
]. |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
29 |
files do:[:file| |
1073 | 30 |
self svnMergeFilesFor: file inDirectoryContaining: files do:[:base :wc :merge :output| ^true ]. |
31 |
files remove: file ifAbsent:[nil]. |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
32 |
]. |
1073 | 33 |
^false |
34 |
||
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
35 |
"Created: / 21-03-2012 / 00:07:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
36 |
! ! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
37 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
38 |
!AbstractFileBrowser methodsFor:'menu-queries-svn'! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
39 |
|
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
40 |
canSubversionMergeWithExternalDiff3 |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
41 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
42 |
| cmd | |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
43 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
44 |
cmd := UserPreferences current svnDiff3Command. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
45 |
^cmd notEmptyOrNil |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
46 |
and:[(OperatingSystem canExecuteCommand: cmd) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
47 |
and:[self canSubversionMerge]]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
48 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
49 |
"Modified: / 20-03-2012 / 15:51:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
50 |
! ! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
51 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
52 |
!AbstractFileBrowser methodsFor:'menu-queries-svn'! |
1046 | 53 |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
54 |
hasSubversionWorkingCopySelected |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
55 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
56 |
^((self currentDirectory / '.svn') exists) and: |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
57 |
[(self currentDirectory / '.svn' / 'entries') exists]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
58 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
59 |
"Created: / 24-06-2010 / 20:13:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
60 |
! ! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
61 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
62 |
!AbstractFileBrowser methodsFor:'menu-queries-svn'! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
63 |
|
1046 | 64 |
hasSubversionWorkingCopySelectedAndDiff3CmdDefined |
65 |
||
66 |
| cmd | |
|
67 |
||
1047 | 68 |
cmd := UserPreferences current svnDiff3Command. |
1046 | 69 |
^cmd notEmptyOrNil |
70 |
and:[(OperatingSystem canExecuteCommand: cmd) |
|
71 |
and:[self hasSubversionWorkingCopySelected]]. |
|
72 |
||
1047 | 73 |
"Modified: / 17-02-2012 / 10:18:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1046 | 74 |
! ! |
75 |
||
933 | 76 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
77 |
|
994 | 78 |
svnAdd |
79 |
||
80 |
self svnExecuteCommand: 'add' |
|
81 |
||
82 |
"Modified: / 08-02-2012 / 09:28:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
83 |
! ! |
|
84 |
||
85 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
86 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
87 |
svnCommit |
1015
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
88 |
| wcPath wc task | |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
89 |
|
1015
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
90 |
wcPath := self currentDirectory asFilename. |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
91 |
wcPath isDirectory ifFalse:[wcPath := wcPath directory]. |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
92 |
wc := SVN::WorkingCopy path: wcPath. |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
93 |
task := SVN::CommitTask new workingCopy: wc. |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
94 |
SVN::CommitDialog2 new |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
95 |
task: task; |
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
96 |
open |
978
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
97 |
|
1015
a7a87f7c51a9
Commit support for filebrowser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
995
diff
changeset
|
98 |
"Modified: / 08-02-2012 / 18:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
978
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
99 |
! ! |
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
100 |
|
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
101 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
102 |
|
994 | 103 |
svnCompare |
104 |
"automatically generated by UIEditor ..." |
|
105 |
||
106 |
"*** the code below performs no action" |
|
107 |
"*** (except for some feedback on the Transcript)" |
|
108 |
"*** Please change as required and accept in the browser." |
|
109 |
"*** (and replace this comment by something more useful ;-)" |
|
110 |
||
111 |
"action to be added ..." |
|
112 |
||
113 |
Transcript showCR:self class name, ': action for #svnCompare ...'. |
|
114 |
! ! |
|
115 |
||
116 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
117 |
||
1044
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
118 |
svnCompare: rev |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
119 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
120 |
Dialog warn: 'Not (yet) implemented' |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
121 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
122 |
"Created: / 14-02-2012 / 19:13:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
123 |
! ! |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
124 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
125 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
126 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
127 |
svnCompareWithBASE |
994 | 128 |
|
1044
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
129 |
self svnCompare: SVN::Revision base |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
130 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
131 |
"Modified: / 14-02-2012 / 19:13:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
132 |
! ! |
994 | 133 |
|
1044
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
134 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
135 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
136 |
svnCompareWithHEAD |
994 | 137 |
|
1044
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
138 |
self svnCompare: SVN::Revision head |
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
139 |
|
1d07191d402a
Fixes/improvements in file browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1023
diff
changeset
|
140 |
"Modified: / 14-02-2012 / 19:13:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 141 |
! ! |
142 |
||
143 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
144 |
||
145 |
svnDebugOpenWorkingCopyBrowser |
|
146 |
| wcPath wc | |
|
147 |
||
148 |
wcPath := self currentDirectory asFilename. |
|
149 |
wcPath isDirectory ifFalse:[wcPath := wcPath directory]. |
|
150 |
wc := SVN::WorkingCopy path: wcPath. |
|
151 |
(SVN::WorkingCopyBrowser on: wc) open |
|
152 |
||
153 |
"Modified: / 07-02-2012 / 22:51:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
154 |
! ! |
|
155 |
||
156 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
157 |
||
978
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
158 |
svnDiff |
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
159 |
|
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
160 |
self svnExecuteCommand: 'diff' |
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
161 |
|
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
162 |
"Created: / 04-02-2012 / 19:26:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
163 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
164 |
|
933 | 165 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
102 | 166 |
|
994 | 167 |
svnExecuteCommand: command |
168 |
"Executes svn command on currently selected objects" |
|
169 |
||
1073 | 170 |
self svnExecuteCommand: command objects: self currentSelectedObjects. |
171 |
||
172 |
"Created: / 04-02-2012 / 19:22:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
173 |
! ! |
|
174 |
||
175 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
176 |
||
177 |
svnExecuteCommand: command objects: givenObjects |
|
178 |
"Executes svn command on given objects (files/dirs)" |
|
179 |
||
994 | 180 |
| objects workdir objectsAsString executionBlock | |
181 |
||
1073 | 182 |
objects := givenObjects. |
994 | 183 |
|
184 |
self class == FileBrowserV2 ifTrue:[ |
|
185 |
workdir := self fileEntryFieldHolder value asFilename. |
|
186 |
workdir isDirectory ifFalse:[ |
|
187 |
workdir := workdir directory |
|
188 |
]. |
|
189 |
] ifFalse:[ |
|
190 |
(objects size == 1 and:[objects anElement isDirectory]) ifTrue:[ |
|
191 |
workdir := objects anElement |
|
192 |
] ifFalse:[ |
|
193 |
workdir := Filename currentDirectory. |
|
194 |
] |
|
195 |
]. |
|
196 |
||
197 |
objectsAsString := String streamContents:[:s| |
|
198 |
objects size == 1 ifTrue:[ |
|
199 |
workdir asString = objects anElement asString ifTrue:[ |
|
200 |
s nextPut:$. |
|
201 |
] ifFalse:[ |
|
202 |
s nextPutAll: objects anElement asString. |
|
203 |
] |
|
204 |
] ifFalse:[ |
|
205 |
objects do:[:each|s nextPut:$"; nextPutAll:each asString; nextPut:$"] |
|
206 |
separatedBy:[s space] |
|
207 |
] |
|
208 |
]. |
|
209 |
||
210 |
executionBlock := [:stream | |
|
211 |
| cmd | |
|
212 |
||
213 |
cmd := '%1 --non-interactive %2 %3' |
|
214 |
bindWith: SVN::Command executable |
|
215 |
with: command |
|
216 |
with: objectsAsString. |
|
1073 | 217 |
stream nextPutAll: cmd; cr; cr. |
994 | 218 |
(self getExecutionBlockForCommand:cmd inDirectory: workdir) value:stream. |
219 |
]. |
|
220 |
self makeExecutionResultProcessFor:executionBlock withName:'svn ', command. |
|
221 |
||
1073 | 222 |
"Created: / 21-03-2012 / 10:08:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 223 |
! ! |
224 |
||
225 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
226 |
||
227 |
svnInfo |
|
228 |
self svnExecuteCommand: 'info' |
|
229 |
||
230 |
"Modified: / 08-02-2012 / 09:33:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
231 |
! ! |
|
232 |
||
233 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
234 |
||
235 |
svnMerge |
|
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
236 |
"Return true, if file is in conflict an can be merged" |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
237 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
238 |
| files | |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
239 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
240 |
files := self currentSelectedFiles. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
241 |
files size ~~ 1 ifTrue:[ ^ self ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
242 |
self svnMergeFilesFor: files anElement do:[:base :wc :merge :output| |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
243 |
output suffix = 'st' ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
244 |
| info | |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
245 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
246 |
Tools::ChangeSetDiffInfo isNil ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
247 |
Dialog warn: 'ChangeSet merge tool not available, JV''s libtool required'. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
248 |
^self. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
249 |
]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
250 |
info := Tools::ChangeSetDiffInfo |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
251 |
specA: (Tools::ChangeSetSpec file: wc pathName) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
252 |
specB: (Tools::ChangeSetSpec file: merge pathName) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
253 |
specBase: (Tools::ChangeSetSpec file: base pathName) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
254 |
specMerge: (Tools::ChangeSetSpec file: output pathName). |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
255 |
Tools::ChangeSetDiffTool new |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
256 |
open; |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
257 |
fileMenuOpenOnDiffInfo: info. |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
258 |
] ifFalse:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
259 |
Dialog warn: 'Merging non .st files not yet supported\Use ''Merge (with external diff3)'' instead' withCRs. |
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
260 |
] |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
261 |
] |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
262 |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
263 |
"Modified: / 21-03-2012 / 00:06:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
264 |
! ! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
265 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
266 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
267 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
268 |
svnMergeAuto |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
269 |
"Return true, if file is in conflict an can be merged" |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
270 |
|
1074 | 271 |
| files unmerged | |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
272 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
273 |
files := self currentSelectedFiles copy. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
274 |
files isEmptyOrNil ifTrue:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
275 |
files := self currentDirectory directoryContentsAsFilenames select:[:e|e isRegularFile]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
276 |
]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
277 |
|
1074 | 278 |
unmerged := OrderedCollection new. |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
279 |
self makeExecutionResultProcessFor:[:stream| |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
280 |
[ files isEmpty ] whileFalse:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
281 |
| file | |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
282 |
|
1073 | 283 |
file := files first. |
284 |
self svnMergeFilesFor: file inDirectoryContaining: files do:[:base :wc :merge :output| |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
285 |
| nm | |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
286 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
287 |
files remove: base ifAbsent:[nil]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
288 |
files remove: wc ifAbsent:[nil]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
289 |
files remove: merge ifAbsent:[nil]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
290 |
files remove: output ifAbsent:[nil]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
291 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
292 |
nm := output baseName. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
293 |
stream nextPutAll: nm; space; next: (40 - nm size) put: $.; space. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
294 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
295 |
output suffix = 'st' ifTrue:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
296 |
| info tool | |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
297 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
298 |
Tools::ChangeSetDiffInfo isNil ifTrue:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
299 |
Dialog warn: 'ChangeSet merge tool not available, JV''s libtool required'. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
300 |
^self. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
301 |
]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
302 |
info := Tools::ChangeSetDiffInfo |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
303 |
specA: (Tools::ChangeSetSpec file: wc pathName) |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
304 |
specB: (Tools::ChangeSetSpec file: merge pathName) |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
305 |
specBase: (Tools::ChangeSetSpec file: base pathName) |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
306 |
specMerge: (Tools::ChangeSetSpec file: output pathName). |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
307 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
308 |
[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
309 |
tool := Tools::ChangeSetDiffTool new. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
310 |
tool fileMenuOpenOnDiffInfo: info. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
311 |
tool canSave ifTrue:[ |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
312 |
tool fileMenuSave. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
313 |
stream nextPutLine: 'MERGED (auto)' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
314 |
] ifFalse:[ |
1074 | 315 |
unmerged add: output. |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
316 |
stream nextPutLine: 'FAILED (conflicts)' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
317 |
] |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
318 |
] on: Error do:[:ex| |
1074 | 319 |
unmerged add: output. |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
320 |
stream nextPutLine: 'FAILED (ERROR: ',ex description, ')'. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
321 |
ex pass |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
322 |
] |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
323 |
] ifFalse:[ |
1074 | 324 |
unmerged add: output. |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
325 |
stream nextPutLine: 'FAILED (no text merge not, use ''Merge (with external diff3)'' instead' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
326 |
]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
327 |
]. |
1073 | 328 |
files remove: file ifAbsent:[nil]. |
1074 | 329 |
]. |
330 |
stream cr;cr. |
|
331 |
unmerged notEmpty ifTrue:[ |
|
332 |
stream nextPutLine:'=== SUMMARY ==='. |
|
333 |
stream nextPutLine:'List of __UNMERGED__ files'. |
|
334 |
unmerged do:[:each| |
|
335 |
stream nextPutAll: ' '; |
|
336 |
nextPutAll: each baseName asString; |
|
337 |
cr. |
|
338 |
] |
|
339 |
||
340 |
]. |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
341 |
] withName:'SVN merge (auto)'. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
342 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
343 |
"Created: / 21-03-2012 / 00:04:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
344 |
! ! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
345 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
346 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
347 |
|
1073 | 348 |
svnMergeBranch |
349 |
||
350 |
| branch | |
|
351 |
branch := Dialog request: 'Enter URL of SVN branch to merge:'. |
|
352 |
branch notEmptyOrNil ifTrue:[ |
|
353 |
self svnExecuteCommand: 'merge ',branch objects: #() |
|
354 |
]. |
|
355 |
||
356 |
"Modified: / 21-03-2012 / 11:01:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
357 |
! ! |
|
358 |
||
359 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
360 |
||
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
361 |
svnMergeFilesFor: file do: aBlock |
994 | 362 |
|
1073 | 363 |
self |
364 |
svnMergeFilesFor: file |
|
365 |
inDirectoryContaining: file directory directoryContentsAsFilenames |
|
366 |
do: aBlock |
|
367 |
||
368 |
"Created: / 20-03-2012 / 15:50:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
369 |
! ! |
|
370 |
||
371 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
372 |
||
373 |
svnMergeFilesFor: file inDirectoryContaining: files do: aBlock |
|
374 |
||
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
375 |
| nm i base wc merge output | |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
376 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
377 |
"Find out base name..." |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
378 |
nm := file pathName. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
379 |
((i := nm indexOfSubCollection: '.working') ~~ 0) ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
380 |
nm := nm copyTo: i - 1 |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
381 |
] ifFalse:[((i := nm indexOfSubCollection: '.merge-left.') ~~ 0) ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
382 |
nm := nm copyTo: i - 1 |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
383 |
] ifFalse:[((i := nm indexOfSubCollection: '.merge-right.') ~~ 0) ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
384 |
nm := nm copyTo: i - 1 |
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
385 |
]]]. |
994 | 386 |
|
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
387 |
output := nm asFilename. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
388 |
output exists ifFalse:[ ^ self ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
389 |
wc := (nm , '.working') asFilename. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
390 |
wc exists ifFalse:[ ^ self ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
391 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
392 |
"Now, search for base and version to merge..." |
994 | 393 |
|
1073 | 394 |
files do:[:each| |
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
395 |
(each pathName startsWith:nm , '.merge-left.') ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
396 |
base := each |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
397 |
]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
398 |
(each pathName startsWith:nm , '.merge-right.') ifTrue:[ |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
399 |
merge := each |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
400 |
]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
401 |
]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
402 |
(base isNil or:[merge isNil]) ifTrue:[ ^ self ]. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
403 |
|
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
404 |
aBlock value: base value:wc value:merge value:output. |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
405 |
|
1073 | 406 |
"Created: / 21-03-2012 / 10:19:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 407 |
! ! |
408 |
||
409 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
410 |
||
411 |
svnMergeWithExternalDiff3 |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
412 |
| files | |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
413 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
414 |
files := self currentSelectedFiles. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
415 |
files size ~~ 1 ifTrue:[ ^ self ]. |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
416 |
self svnMergeFilesFor: files anElement do:[:base :wc :merge :output| |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
417 |
OperatingSystem executeCommand: |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
418 |
('%1 %2 %3 %4 -o %5' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
419 |
bindWith: UserPreferences current svnDiff3Command |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
420 |
with: base pathName |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
421 |
with: wc pathName |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
422 |
with: merge pathName |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
423 |
with: output pathName) |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
424 |
] |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
425 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
426 |
"Modified: / 20-03-2012 / 23:21:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 427 |
! ! |
428 |
||
429 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
430 |
||
431 |
svnRemove |
|
432 |
||
433 |
self svnExecuteCommand: 'remove' |
|
434 |
||
435 |
"Created: / 08-02-2012 / 09:28:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
436 |
! ! |
|
437 |
||
438 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
439 |
||
440 |
svnRevert |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
441 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
442 |
self svnExecuteCommand: 'revert' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
443 |
|
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
444 |
"Modified: / 21-03-2012 / 01:53:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 445 |
! ! |
446 |
||
447 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
448 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
449 |
svnStatus |
102 | 450 |
|
978
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
451 |
self svnExecuteCommand: 'status' |
102 | 452 |
|
978
e1dab0ebb3a5
improvements in FileBrowser menu
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
935
diff
changeset
|
453 |
"Modified: / 04-02-2012 / 19:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 454 |
! ! |
455 |
||
994 | 456 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
457 |
||
458 |
svnStatusShowUpdates |
|
459 |
||
460 |
self svnExecuteCommand: 'status --show-updates --verbose' |
|
461 |
||
462 |
"Modified: / 04-02-2012 / 19:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
463 |
"Created: / 07-02-2012 / 19:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
464 |
! ! |
|
465 |
||
466 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
467 |
||
468 |
svnUpdate |
|
469 |
||
470 |
self svnExecuteCommand:'update' |
|
471 |
||
472 |
"Modified: / 08-02-2012 / 09:29:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
473 |
! ! |
|
474 |
||
475 |
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'! |
|
476 |
||
477 |
svnUpdateWithExternalDiff3 |
|
1046 | 478 |
| cmd | |
994 | 479 |
|
1046 | 480 |
cmd := UserPreferences current svnDiff2Command. |
481 |
self svnExecuteCommand: |
|
482 |
(' --diff3-cmd="%1" update' bindWith: cmd). |
|
994 | 483 |
|
1046 | 484 |
"Modified: / 17-02-2012 / 01:38:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
994 | 485 |
! ! |
486 |
||
995 | 487 |
!AbstractFileBrowser class methodsFor:'menu specs'! |
488 |
||
489 |
scmMenuSlice |
|
490 |
"This resource specification was automatically generated |
|
491 |
by the MenuEditor of ST/X." |
|
492 |
||
493 |
"Do not manually edit this!! If it is corrupted, |
|
494 |
the MenuEditor may not be able to read the specification." |
|
495 |
||
496 |
||
497 |
" |
|
498 |
MenuEditor new openOnClass:AbstractFileBrowser andSelector:#scmMenuSlice |
|
499 |
(Menu new fromLiteralArrayEncoding:(AbstractFileBrowser scmMenuSlice)) startUp |
|
500 |
" |
|
501 |
||
502 |
<resource: #menu> |
|
503 |
||
504 |
^ |
|
505 |
#(Menu |
|
506 |
( |
|
507 |
(MenuItem |
|
508 |
label: 'CVS' |
|
509 |
translateLabel: true |
|
510 |
isVisible: cvsMenusAreShown |
|
511 |
submenuChannel: cvsMenu |
|
512 |
) |
|
513 |
(MenuItem |
|
514 |
label: 'SVN' |
|
515 |
translateLabel: true |
|
516 |
isVisible: svnMenusAreShown |
|
517 |
submenuChannel: svnMenu |
|
518 |
) |
|
519 |
(MenuItem |
|
520 |
label: 'Mercurial' |
|
521 |
translateLabel: true |
|
522 |
isVisible: mercurialMenusAreShown |
|
523 |
submenuChannel: mercurialMenu |
|
524 |
) |
|
525 |
(MenuItem |
|
526 |
label: 'Perforce' |
|
527 |
translateLabel: true |
|
528 |
isVisible: perforceMenusAreShown |
|
529 |
submenuChannel: perforceMenu |
|
530 |
) |
|
531 |
) |
|
532 |
nil |
|
533 |
nil |
|
534 |
) |
|
535 |
! ! |
|
536 |
||
1048 | 537 |
!AbstractFileBrowser class methodsFor:'menu specs-scm'! |
538 |
||
539 |
svnMenu |
|
540 |
"This resource specification was automatically generated |
|
541 |
by the MenuEditor of ST/X." |
|
542 |
||
543 |
"Do not manually edit this!! If it is corrupted, |
|
544 |
the MenuEditor may not be able to read the specification." |
|
545 |
||
546 |
||
547 |
" |
|
548 |
MenuEditor new openOnClass:AbstractFileBrowser andSelector:#svnMenu |
|
549 |
(Menu new fromLiteralArrayEncoding:(AbstractFileBrowser svnMenu)) startUp |
|
550 |
" |
|
551 |
||
552 |
<resource: #menu> |
|
553 |
||
554 |
^ |
|
555 |
#(Menu |
|
556 |
( |
|
557 |
(MenuItem |
|
558 |
enabled: hasSubversionWorkingCopySelected |
|
559 |
label: 'Commit' |
|
560 |
itemValue: svnCommit |
|
561 |
translateLabel: true |
|
562 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit') |
|
563 |
) |
|
564 |
(MenuItem |
|
565 |
label: '-' |
|
566 |
) |
|
567 |
(MenuItem |
|
568 |
enabled: hasSubversionWorkingCopySelected |
|
569 |
label: 'Update' |
|
570 |
itemValue: svnUpdate |
|
571 |
translateLabel: true |
|
572 |
) |
|
573 |
(MenuItem |
|
574 |
enabled: hasSubversionWorkingCopySelectedAndDiff3CmdDefined |
|
575 |
label: 'Update (external diff3) ' |
|
576 |
itemValue: svnUpdateWithExternalDiff3 |
|
577 |
translateLabel: true |
|
578 |
) |
|
579 |
(MenuItem |
|
580 |
label: '-' |
|
581 |
) |
|
582 |
(MenuItem |
|
583 |
enabled: hasSubversionWorkingCopySelected |
|
584 |
label: 'Add' |
|
585 |
itemValue: svnAdd |
|
586 |
translateLabel: true |
|
587 |
) |
|
588 |
(MenuItem |
|
589 |
enabled: hasSubversionWorkingCopySelected |
|
590 |
label: 'Remove' |
|
591 |
itemValue: svnRemove |
|
592 |
translateLabel: true |
|
593 |
) |
|
594 |
(MenuItem |
|
595 |
enabled: hasSubversionWorkingCopySelected |
|
596 |
label: 'Revert' |
|
597 |
itemValue: svnRevert |
|
598 |
translateLabel: true |
|
599 |
) |
|
600 |
(MenuItem |
|
601 |
label: '-' |
|
602 |
) |
|
603 |
(MenuItem |
|
604 |
enabled: hasSubversionWorkingCopySelected |
|
605 |
label: 'Status' |
|
606 |
itemValue: svnStatus |
|
607 |
translateLabel: true |
|
608 |
) |
|
609 |
(MenuItem |
|
610 |
enabled: hasSubversionWorkingCopySelected |
|
611 |
label: 'Status (show updates)' |
|
612 |
itemValue: svnStatusShowUpdates |
|
613 |
translateLabel: true |
|
614 |
) |
|
615 |
(MenuItem |
|
616 |
enabled: hasSubversionWorkingCopySelected |
|
617 |
label: 'Info' |
|
618 |
itemValue: svnInfo |
|
619 |
translateLabel: true |
|
620 |
) |
|
621 |
(MenuItem |
|
622 |
label: '-' |
|
623 |
) |
|
624 |
(MenuItem |
|
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
625 |
enabled: canSubversionMerge |
1048 | 626 |
label: 'Merge...' |
627 |
itemValue: svnMerge |
|
628 |
translateLabel: true |
|
629 |
) |
|
630 |
(MenuItem |
|
1072
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
631 |
enabled: canSubversionMergeAuto |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
632 |
label: 'Merge (auto)' |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
633 |
itemValue: svnMergeAuto |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
634 |
translateLabel: true |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
635 |
) |
36120b651806
Merging support in FileBrowser improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1070
diff
changeset
|
636 |
(MenuItem |
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
637 |
enabled: canSubversionMergeWithExternalDiff3 |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
638 |
label: 'Merge (external diff3)' |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
639 |
itemValue: svnMergeWithExternalDiff3 |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
640 |
translateLabel: true |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
641 |
) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
642 |
(MenuItem |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
643 |
enabled: canSubversionResolve |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
644 |
label: 'Resolve' |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
645 |
itemValue: svnResolve |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
646 |
translateLabel: true |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
647 |
) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
648 |
(MenuItem |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
649 |
label: '-' |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
650 |
) |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
651 |
(MenuItem |
1073 | 652 |
enabled: hasSubversionWorkingCopySelected |
1070
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
653 |
label: 'Merge Branch...' |
83db0ef5f4dd
Basic support for merging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1056
diff
changeset
|
654 |
itemValue: svnMergeBranch |
1048 | 655 |
translateLabel: true |
656 |
) |
|
657 |
(MenuItem |
|
658 |
label: '-' |
|
659 |
) |
|
660 |
(MenuItem |
|
661 |
enabled: hasSubversionWorkingCopySelected |
|
662 |
label: 'Compare' |
|
663 |
itemValue: svnCompareWithBASE |
|
664 |
translateLabel: true |
|
665 |
) |
|
666 |
(MenuItem |
|
667 |
enabled: hasSubversionWorkingCopySelected |
|
668 |
label: 'Compare with HEAD' |
|
669 |
itemValue: svnCompareWithHEAD |
|
670 |
translateLabel: true |
|
671 |
) |
|
672 |
(MenuItem |
|
673 |
enabled: hasSubversionWorkingCopySelected |
|
674 |
label: 'Compare with Revision...' |
|
675 |
itemValue: svnCompare |
|
676 |
translateLabel: true |
|
677 |
) |
|
678 |
(MenuItem |
|
679 |
enabled: hasSubversionWorkingCopySelected |
|
680 |
label: 'Diff (svn diff ...)' |
|
681 |
itemValue: svnDiff |
|
682 |
translateLabel: true |
|
683 |
) |
|
684 |
(MenuItem |
|
685 |
label: '-' |
|
686 |
) |
|
687 |
(MenuItem |
|
688 |
enabled: hasSubversionWorkingCopySelected |
|
689 |
label: 'Debug' |
|
690 |
translateLabel: true |
|
691 |
submenu: |
|
692 |
(Menu |
|
693 |
( |
|
694 |
(MenuItem |
|
695 |
enabled: hasSubversionWorkingCopySelected |
|
696 |
label: 'Open Working Copy Browser' |
|
697 |
itemValue: svnDebugOpenWorkingCopyBrowser |
|
698 |
translateLabel: true |
|
699 |
) |
|
700 |
) |
|
701 |
nil |
|
702 |
nil |
|
703 |
) |
|
704 |
) |
|
705 |
) |
|
706 |
nil |
|
707 |
nil |
|
708 |
) |
|
709 |
! ! |
|
710 |
||
230 | 711 |
!ChangeSet methodsFor:'utilities'! |
102 | 712 |
|
713 |
condenseChangesForPackage2:aPackageSymbol |
|
714 |
"remove more changes for aPackageSymbol |
|
715 |
This is invoked when a project is checked into the repository." |
|
716 |
||
717 |
|changesToRemove| |
|
718 |
||
105 | 719 |
changesToRemove := self select:[:aChange | |
720 |
|removeThis mClass mthd| |
|
102 | 721 |
|
105 | 722 |
removeThis := false. |
723 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
|
724 |
mClass := aChange changeClass. |
|
725 |
mClass notNil ifTrue:[ |
|
726 |
mthd := mClass compiledMethodAt:(aChange selector). |
|
727 |
mthd isNil ifTrue:[ |
|
728 |
removeThis := (mClass package = aPackageSymbol) |
|
729 |
] ifFalse:[ |
|
730 |
removeThis := (mthd package = aPackageSymbol) |
|
731 |
] |
|
732 |
]. |
|
733 |
] ifFalse:[ |
|
734 |
(aChange isClassChange) ifTrue:[ |
|
735 |
(aChange changeClass notNil) ifTrue:[ |
|
736 |
removeThis := (aChange changeClass package = aPackageSymbol) |
|
737 |
]. |
|
738 |
]. |
|
739 |
]. |
|
740 |
removeThis |
|
102 | 741 |
]. |
742 |
||
743 |
self condenseChanges:changesToRemove |
|
744 |
||
745 |
"Modified: / 12-10-2006 / 16:51:27 / cg" |
|
746 |
"Created: / 09-08-2009 / 14:29:17 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
747 |
! ! |
|
748 |
||
230 | 749 |
!Class methodsFor:'fileOut'! |
102 | 750 |
|
751 |
fileOutAsMethodIn: class selector: selector |
|
752 |
||
753 |
^self fileOutAsMethodIn: class selector: selector category: 'sources' |
|
754 |
||
755 |
"Created: / 08-04-2009 / 20:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
756 |
! ! |
|
757 |
||
230 | 758 |
!Class methodsFor:'accessing'! |
102 | 759 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
760 |
svnBranch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
761 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
762 |
^self svnRepository branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
763 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
764 |
"Created: / 19-04-2008 / 18:24:54 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
765 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
766 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
767 |
!Class methodsFor:'accessing'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
768 |
|
102 | 769 |
svnRepository |
770 |
||
771 |
^SVN::RepositoryManager repositoryForPackage: self package |
|
772 |
||
773 |
"Created: / 19-04-2008 / 18:24:54 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
774 |
! ! |
|
775 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
776 |
!Date methodsFor:'converting'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
777 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
778 |
asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
779 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
780 |
^SVNv2::RevisionSpec date: self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
781 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
782 |
"Created: / 03-02-2011 / 00:01:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
783 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
784 |
|
230 | 785 |
!Filename methodsFor:'reading-directories'! |
102 | 786 |
|
787 |
directoryContentsAsFilenamesMatching: patternOrCollectionOfThose |
|
788 |
||
789 |
" |
|
105 | 790 |
Same as directoryContentsAsFilenames, but returns only files |
791 |
that matches given patterns. This uses String>>matches: |
|
792 |
for pattern matching |
|
102 | 793 |
" |
794 |
||
795 |
|names| |
|
796 |
||
797 |
names := self directoryContentsMatching: patternOrCollectionOfThose . |
|
798 |
names isNil ifTrue:[^ nil]. |
|
799 |
^ names asOrderedCollection collect:[:entry | self construct:entry]. |
|
800 |
||
801 |
" |
|
105 | 802 |
'/etc' asFilename |
803 |
directoryContentsAsFilenamesMatching: 'pass*' |
|
102 | 804 |
|
105 | 805 |
'/etc' asFilename |
806 |
directoryContentsAsFilenamesMatching: #('pass*' 'nsswitch.conf') |
|
102 | 807 |
" |
808 |
||
809 |
"Created: / 03-06-2009 / 09:57:45 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
810 |
! ! |
|
811 |
||
230 | 812 |
!Filename methodsFor:'reading-directories'! |
102 | 813 |
|
814 |
directoryContentsMatching: patternOrCollectionOfThose |
|
815 |
||
816 |
" |
|
105 | 817 |
Same as directoryContants, but returns only files |
818 |
that matches given patterns. This uses String>>matches: |
|
819 |
for pattern matching |
|
102 | 820 |
" |
821 |
||
822 |
| names patterns | |
|
823 |
patterns := patternOrCollectionOfThose isString |
|
105 | 824 |
ifTrue: [Array with: patternOrCollectionOfThose] |
825 |
ifFalse:[patternOrCollectionOfThose]. |
|
102 | 826 |
names := self directoryContents. |
827 |
names ifNil:[^nil]. |
|
828 |
^names select: |
|
105 | 829 |
[:e|patterns anySatisfy:[:pattern|e matches: pattern]] |
102 | 830 |
|
831 |
" |
|
105 | 832 |
'/etc' asFilename |
833 |
directoryContentsMatching: 'pass*' |
|
102 | 834 |
|
105 | 835 |
'/etc' asFilename |
836 |
directoryContentsMatching: #('pass*' 'nsswitch.conf') |
|
102 | 837 |
|
105 | 838 |
'/etc' asFilename |
839 |
directoryContentsMatching: #('does-not-exists.txt') |
|
102 | 840 |
|
841 |
" |
|
842 |
||
843 |
"Created: / 03-06-2009 / 09:52:52 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
844 |
! ! |
|
845 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
846 |
!FilenameWidgetWithHistory methodsFor:'accessing'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
847 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
848 |
historyList:aList |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
849 |
"set the history - useful when two or more such fields shall share a common history" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
850 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
851 |
history := aList. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
852 |
fileNameEntryField listHolder: aList. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
853 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
854 |
"Modified: / 27-11-2009 / 13:05:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
855 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
856 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
857 |
!FilenameWidgetWithHistory methodsFor:'accessing-channels'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
858 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
859 |
modifiedChannel:aValueHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
860 |
fileNameEntryField modifiedChannel:aValueHolder. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
861 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
862 |
"Created: / 27-11-2009 / 12:06:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
863 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
864 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
865 |
!Integer methodsFor:'converting'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
866 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
867 |
asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
868 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
869 |
^SVNv2::RevisionSpec number: self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
870 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
871 |
"Created: / 03-02-2011 / 00:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
872 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
873 |
|
230 | 874 |
!Method methodsFor:'accessing'! |
102 | 875 |
|
876 |
makeSourceFileAbsolute |
|
877 |
||
878 |
" |
|
590 | 879 |
Makes a source file reference absolute. |
880 |
This is required by SVN, because svn working copy |
|
881 |
is in package path, so it's existence may corrupt source |
|
882 |
files. |
|
102 | 883 |
" |
884 |
||
885 |
| fileStream | |
|
105 | 886 |
|
102 | 887 |
"check whether my source is in external file. If not, this is noop" |
888 |
sourcePosition ifNil:[^nil]. |
|
889 |
"already absolute" |
|
890 |
source asFilename isAbsolute ifTrue:[^self]. |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
891 |
fileStream := self rawSourceStreamUsingCache: false. |
102 | 892 |
fileStream isFileStream ifTrue: |
590 | 893 |
[source := fileStream fileName asAbsoluteFilename pathName]. |
102 | 894 |
|
895 |
" |
|
590 | 896 |
(Method compiledMethodAt:#mclass:) |
897 |
makeSourceFileAbsolute |
|
102 | 898 |
" |
899 |
||
900 |
"Created: / 21-08-2009 / 17:24:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
901 |
"Modified: / 25-02-2010 / 22:21:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
902 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
903 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
904 |
!MethodChange methodsFor:'converting'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
905 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
906 |
asAntiChange |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
907 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
908 |
^self isMethodCodeChange |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
909 |
ifTrue:[MethodRemoveChange className: self className selector: self selector] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
910 |
ifFalse:[super asAntiChange] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
911 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
912 |
"Created: / 02-11-2009 / 11:13:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 913 |
! ! |
914 |
||
230 | 915 |
!MethodChange methodsFor:'queries'! |
102 | 916 |
|
917 |
isForGeneratedSubject |
|
918 |
" |
|
919 |
Answers true iff subject of this method is somewhat |
|
920 |
auto-generated by some tool - just like version methods |
|
921 |
are. |
|
922 |
" |
|
923 |
||
366 | 924 |
^self isForMeta |
925 |
and:[((self selector) == #version) |
|
926 |
or:[self selector startsWith:'version_' ] |
|
927 |
] |
|
102 | 928 |
|
929 |
"Created: / 17-08-2009 / 18:56:59 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
930 |
! ! |
|
931 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
932 |
!ProjectDefinition class methodsFor:'code generation'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
933 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
934 |
forEachContentsMethodsCodeToCompileDo:aTwoArgBlock ignoreOldEntries: ignoreOldEntries ignoreOldDefinition:ignoreOldDefinition |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
935 |
aTwoArgBlock |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
936 |
value:(self classNamesAndAttributes_code_ignoreOldEntries:ignoreOldEntries ignoreOldDefinition:ignoreOldDefinition) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
937 |
value:'description - contents'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
938 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
939 |
aTwoArgBlock |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
940 |
value: (self extensionMethodNames_code_ignoreOldEntries:ignoreOldEntries) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
941 |
value: 'description - contents'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
942 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
943 |
aTwoArgBlock |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
944 |
value: self preRequisites_code |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
945 |
value: 'description'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
946 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
947 |
aTwoArgBlock |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
948 |
value: self excludedFromPreRequisites_code |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
949 |
value: 'description'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
950 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
951 |
"Created: / 09-07-2010 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
952 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
953 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
954 |
!ProjectDefinition class methodsFor:'accessing - svn'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
955 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
956 |
svnRepositoryUrl |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
957 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
958 |
| url | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
959 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
960 |
(self respondsTo:#svnRepositoryUrlString) ifFalse:[^nil]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
961 |
url := self svnRepositoryUrlString. |
935 | 962 |
(url startsWith: '$' , 'URL: ') |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
963 |
ifTrue:[url := url copyFrom: 7 to: (url lastIndexOf: $/) - 1] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
964 |
ifFalse:[nil]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
965 |
^url |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
966 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
967 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
968 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
969 |
stx_libjava svnRepositoryUrl |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
970 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
971 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
972 |
"Created: / 08-04-2011 / 16:20:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
973 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
974 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
975 |
!ProjectDefinition class methodsFor:'code generation'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
976 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
977 |
svnRepositoryUrlString_code |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
978 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
979 |
^'svnRepositoryUrlString |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
980 |
"Return a SVN repository URL of myself. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
981 |
(Generated since 2011-04-08) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
982 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
983 |
|
935 | 984 |
^ ''$','URL$''' |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
985 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
986 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
987 |
self svnRepositoryUrlString_code |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
988 |
stx_libbasic3 svnRepositoryUrlString_code |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
989 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
990 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
991 |
"Created: / 08-04-2011 / 16:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
992 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
993 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
994 |
!String methodsFor:'converting'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
995 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
996 |
asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
997 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
998 |
| number date | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
999 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1000 |
self = 'HEAD' ifTrue:[^SVNv2::RevisionSpec head]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1001 |
self = 'head' ifTrue:[^SVNv2::RevisionSpec head]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1002 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1003 |
number := Integer fromString: self onError:[nil]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1004 |
number ifNotNil:[^SVNv2::RevisionSpec number: number]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1005 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1006 |
date := Date readFrom: self onError:[nil]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1007 |
date ifNotNil:[^SVNv2::RevisionSpec date: date]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1008 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1009 |
self error: 'Not a SVN revision spec'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1010 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1011 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1012 |
'HEAD' asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1013 |
'123' asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1014 |
'2010-12-12' asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1015 |
'bla bla' asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1016 |
123 asSVNRevisionSpec |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1017 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1018 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1019 |
"Created: / 03-02-2011 / 00:06:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1020 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1021 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1022 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1023 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1024 |
classMenuDiffsetFor:classes againstBranch:branch revision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1025 |
|diffset| |
798
e26bf2ccff03
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
788
diff
changeset
|
1026 |
diffset := (ChangeSetDiffSet new) |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1027 |
name:'Differences between image and ', branch name asString , '@' , revision printString; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1028 |
versionALabel: 'Current (image)'; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1029 |
versionBLabel: revision printString. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1030 |
classes do: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1031 |
[:cls | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1032 |
diffset add:(branch diffSetForClass:cls betweenImageAndRevision:revision)]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1033 |
^diffset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1034 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1035 |
"Created: / 19-04-2008 / 18:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
798
e26bf2ccff03
checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
788
diff
changeset
|
1036 |
"Modified: / 13-09-2011 / 12:28:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1037 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1038 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1039 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1040 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1041 |
classMenuSubversionBrowseWorkingCopy |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1042 |
"automatically generated by UIEditor ..." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1043 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1044 |
"*** the code below performs no action" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1045 |
"*** (except for some feedback on the Transcript)" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1046 |
"*** Please change as required and accept in the browser." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1047 |
"*** (and replace this comment by something more useful ;-)" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1048 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1049 |
"action to be added ..." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1050 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1051 |
Transcript showCR:self class name, ': action for #classMenuSubversionBrowseWorkingCopy ...'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1052 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1053 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1054 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1055 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1056 |
classMenuSubversionChangeset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1057 |
|classes| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1058 |
classes := self selectedNonMetaclasses. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1059 |
(SVN::BranchAndRevisionSelectionDialog new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1060 |
title:'Changeset for ' , (self infoStringForClasses:classes withPrefix:''); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1061 |
repository:classes anyOne svnRepository; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1062 |
branch:classes anyOne svnRepository trunk; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1063 |
onAccept: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1064 |
[:dlg | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1065 |
dlg showProgressWhile: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1066 |
[self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1067 |
classMenuSubversionChangeset:classes |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1068 |
againstBranch:dlg branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1069 |
revision:dlg revision]]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1070 |
open |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1071 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1072 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1073 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1074 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1075 |
classMenuSubversionChangeset: classes againstBranch: branch revision: rev |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1076 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1077 |
| diffset changeset | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1078 |
diffset := self classMenuDiffsetFor:classes againstBranch:branch revision: rev. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1079 |
changeset := diffset changesetA. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1080 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1081 |
(Smalltalk at:#'Tools::ChangeSetBrowser') |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1082 |
ifNil:[ChangeSetBrowser openOn: changeset] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1083 |
ifNotNil:[(Tools::ChangeSetBrowser on: changeset) open] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1084 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1085 |
|
230 | 1086 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1087 |
|
1088 |
classMenuSubversionCommit |
|
1089 |
||
1090 |
| classesPerPackage | |
|
1091 |
classesPerPackage := Dictionary new. |
|
1092 |
self selectedClasses value do: |
|
1023 | 1093 |
[:class| |
1094 |
(classesPerPackage at: class theNonMetaclass package ifAbsentPut:[Set new]) |
|
1095 |
add: class theNonMetaclass]. |
|
102 | 1096 |
classesPerPackage keysAndValuesDo: |
1023 | 1097 |
[:package :classes| | repo | |
1098 |
repo := SVN::RepositoryManager repositoryForPackage:package. |
|
1099 |
"/SVN::CommitWizard new |
|
1100 |
SVN::CommitDialog2 new |
|
1101 |
task: (repo workingCopy commitTask |
|
1102 |
classes: classes; |
|
1103 |
extensionMethods: #() |
|
1104 |
yourself); |
|
1105 |
open] |
|
102 | 1106 |
|
1107 |
"Modified: / 16-06-2009 / 21:05:21 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1023 | 1108 |
"Modified: / 09-02-2012 / 10:32:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1109 |
! ! |
1110 |
||
230 | 1111 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1112 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1113 |
classMenuSubversionCompare |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1114 |
|classes| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1115 |
classes := self selectedNonMetaclasses. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1116 |
(SVN::BranchAndRevisionSelectionDialog new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1117 |
title:'Compare ' , (self infoStringForClasses:classes withPrefix:''); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1118 |
repository:classes anyOne svnRepository; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1119 |
branch:classes anyOne svnRepository trunk; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1120 |
onAccept: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1121 |
[:dlg | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1122 |
dlg showProgressWhile: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1123 |
[self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1124 |
classMenuSubversionCompare:classes |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1125 |
withBranch:dlg branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1126 |
revision:dlg revision]]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1127 |
open |
102 | 1128 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1129 |
"Modified: / 01-11-2009 / 15:50:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1130 |
! ! |
1131 |
||
230 | 1132 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1133 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1134 |
classMenuSubversionCompare:classes withBranch:branch revision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1135 |
|diffset| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1136 |
diffset := self classMenuDiffsetFor:classes againstBranch:branch revision:revision. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1137 |
diffset isEmpty ifTrue: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1138 |
[^Dialog inform: 'No differences found']. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1139 |
(Tools::ChangeSetDiffTool new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1140 |
beTwoColumn:(classes size > 1); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1141 |
diffset:diffset; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1142 |
open |
241 | 1143 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1144 |
"Created: / 19-04-2008 / 18:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1145 |
"Modified: / 05-12-2009 / 11:14:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1146 |
"Modified: / 07-07-2011 / 23:08:33 / jv" |
102 | 1147 |
! ! |
1148 |
||
230 | 1149 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1150 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1151 |
classMenuSubversionCompare:classes withRevision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1152 |
self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1153 |
classMenuSubversionCompare:classes |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1154 |
withBranch:classes anyOne svnBranch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1155 |
revision:revision |
102 | 1156 |
|
1157 |
"Created: / 19-04-2008 / 18:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1158 |
! ! |
|
1159 |
||
230 | 1160 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1161 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1162 |
classMenuSubversionCompareWithRevisionHead |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1163 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1164 |
| classes | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1165 |
classes := self selectedNonMetaclasses. |
102 | 1166 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1167 |
SVN::ProgressDialog |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1168 |
openOn:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1169 |
self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1170 |
classMenuSubversionCompare:classes |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1171 |
withRevision:SVN::Revision head |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1172 |
] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1173 |
title:'Compare ',(self infoStringForClasses:classes withPrefix:''),' with rev. HEAD' |
102 | 1174 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1175 |
"Created: / 19-04-2008 / 18:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1176 |
"Modified: / 01-11-2009 / 15:51:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1177 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1178 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1179 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-class'! |
102 | 1180 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1181 |
classMenuSubversionUpdate |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1182 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1183 |
self classMenuSubversionLoadRevision: SVN::Revision head |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1184 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1185 |
"Modified: / 10-12-2009 / 13:37:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1186 |
! ! |
1187 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1188 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1189 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1190 |
classSubversionChangesetMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1191 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1192 |
<resource: #programMenu > |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1193 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1194 |
|menu repo branches| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1195 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1196 |
menu := Menu decodeFromLiteralArray: self class classSubversionChangesetMenu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1197 |
repo := SVN::RepositoryManager repositoryForPackage:self theSingleSelectedProjectFromClasses. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1198 |
branches := repo branches. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1199 |
branches size = 1 ifTrue:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1200 |
menu removeItemAt:2. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1201 |
^ menu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1202 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1203 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1204 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1205 |
branches do:[:branch | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1206 |
menu addItem: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1207 |
(MenuItem new |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1208 |
label: (LabelAndIcon |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1209 |
label: ('Changeset against ', branch name) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1210 |
icon: (branch icon)); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1211 |
value: [self classMenuSubversionChangeset: self selectedClasses value againstBranch: branch revision: SVN::Revision head]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1212 |
enabled: (repo branch = branch) not) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1213 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1214 |
^menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1215 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1216 |
"Created: / 25-11-2009 / 14:10:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1217 |
"Modified: / 25-11-2009 / 16:48:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1218 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1219 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1220 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1221 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1222 |
commonMenuSubversionBrowseWorkingCopy |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1223 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1224 |
self selectedProjectsForSubversion value do: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1225 |
[:package| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1226 |
| repo wc | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1227 |
repo := self svnRepositoryManager repositoryForPackage: package. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1228 |
wc := repo workingCopy. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1229 |
wc exists ifFalse:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1230 |
wc checkout. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1231 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1232 |
FileBrowserV2 openOn: wc path] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1233 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1234 |
"Modified: / 09-12-2010 / 23:45:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1235 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1236 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1237 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1238 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1239 |
commonMenuSubversionFlushCaches |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1240 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1241 |
self svnRepositoryManager reset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1242 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1243 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1244 |
!Tools::NewSystemBrowser methodsFor:'aspects-queries-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1245 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1246 |
hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1247 |
^ [ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1248 |
| classes | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1249 |
classes := self selectedClasses value. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1250 |
classes isEmptyOrNil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1251 |
ifTrue: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1252 |
[false] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1253 |
ifFalse: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1254 |
[classes |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1255 |
allSatisfy: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1256 |
[:cls | self hasSubversionRepositoryAndBranchFor: cls theNonMetaclass package] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1257 |
] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1258 |
] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1259 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1260 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1261 |
!Tools::NewSystemBrowser methodsFor:'aspects-queries-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1262 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1263 |
hasProjectSelectedSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1264 |
^ [ self hasProjectSelected |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1265 |
and:[self selectedProjects value size = 1 |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1266 |
and:[self hasSubversionRepositoryAndBranchFor: self selectedProjects value anyOne]]] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1267 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1268 |
"Created: / 31-03-2008 / 15:07:52 / janfrog" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1269 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1270 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1271 |
!Tools::NewSystemBrowser methodsFor:'aspects-queries-subversion'! |
239 | 1272 |
|
1273 |
hasSingleClassAndSubversionRepositoryExists |
|
1274 |
^ self hasSingleClassSelected |
|
366 | 1275 |
and:[self hasSubversionRepositoryFor: self theSingleSelectedClass package] |
239 | 1276 |
|
1277 |
"Created: / 19-04-2008 / 17:40:39 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1278 |
! ! |
|
1279 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1280 |
!Tools::NewSystemBrowser methodsFor:'aspects-queries-subversion'! |
102 | 1281 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1282 |
hasSubversionRepositoryAndBranchFor: package |
102 | 1283 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1284 |
| repo | |
102 | 1285 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1286 |
^ self hasSubversionSupport |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1287 |
and:[(repo := self svnRepositoryManager repositoryForPackage: package) notNil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1288 |
and:[repo workingCopy hasBranch]] |
102 | 1289 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1290 |
"Created: / 31-03-2008 / 15:08:13 / janfrog" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1291 |
"Modified: / 22-08-2009 / 10:49:33 / Jan Vrany <vranyj1@fel.cvut.cz>" |
102 | 1292 |
! ! |
1293 |
||
230 | 1294 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1295 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1296 |
projectMenuSubversionChangeset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1297 |
|repo| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1298 |
repo := SVN::RepositoryManager |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1299 |
repositoryForPackage:self theSingleSelectedProject. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1300 |
(SVN::BranchAndRevisionSelectionDialog new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1301 |
title:'Changeset ' , self theSingleSelectedProject asText allItalic; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1302 |
repository:repo; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1303 |
branch:repo trunk; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1304 |
onAccept: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1305 |
[:dlg | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1306 |
dlg showProgressWhile: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1307 |
[self projectMenuSubversionChangesetAgainstBranch:dlg branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1308 |
revision:dlg revision]]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1309 |
open |
102 | 1310 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1311 |
"Created: / 20-05-2008 / 18:09:20 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1312 |
"Modified: / 02-11-2009 / 16:45:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1313 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1314 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1315 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1316 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1317 |
projectMenuSubversionChangesetAgainstBranch:branch revision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1318 |
|changeset diffset| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1319 |
diffset := branch diffSetBetweenImageAndRevision:revision. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1320 |
changeset := diffset changesetA. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1321 |
(Smalltalk at:#'Tools::ChangeSetBrowser') |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1322 |
ifNil:[ChangeSetBrowser openOn: changeset] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1323 |
ifNotNil:[(Tools::ChangeSetBrowser on: changeset) open] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1324 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1325 |
"Modified: / 09-08-2009 / 14:14:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1326 |
"Created: / 02-11-2009 / 13:41:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1327 |
"Modified: / 05-12-2009 / 11:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1328 |
! ! |
1329 |
||
230 | 1330 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1331 |
|
1332 |
projectMenuSubversionCommit |
|
1333 |
||
1334 |
self selectedProjects value do: |
|
1023 | 1335 |
[:package| |
1336 |
| repo | |
|
1337 |
repo := SVN::RepositoryManager repositoryForPackage:package. |
|
1338 |
"/SVN::CommitWizard new |
|
1339 |
SVN::CommitDialog2 new |
|
1340 |
task: repo workingCopy commitTask; |
|
1341 |
open] |
|
102 | 1342 |
|
1343 |
"Created: / 01-04-2008 / 19:02:42 / janfrog" |
|
1344 |
"Modified: / 16-08-2009 / 19:17:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1023 | 1345 |
"Modified: / 09-02-2012 / 10:32:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1346 |
! ! |
1347 |
||
230 | 1348 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1349 |
|
1350 |
projectMenuSubversionCommitMode |
|
1351 |
||
1352 |
^(PluggableAdaptor on: self theSingleSelectedProject) |
|
105 | 1353 |
getBlock: |
1354 |
[:prjHolder| | wc | |
|
1355 |
wc := SVN::RepositoryManager workingCopyForPackage: self theSingleSelectedProject value. |
|
1356 |
wc ifNotNil:[wc commitMode] ifNil:[nil]] |
|
1357 |
putBlock: |
|
1358 |
[:prjHolder :value| | wc | |
|
1359 |
wc := SVN::RepositoryManager workingCopyForPackage: self theSingleSelectedProject value. |
|
1360 |
wc ifNotNil:[wc commitMode:value]] |
|
1361 |
updateBlock: |
|
1362 |
[:prjHolder :aspect :value|true]. |
|
102 | 1363 |
|
1364 |
"Created: / 13-08-2009 / 15:05:45 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1365 |
! ! |
|
1366 |
||
230 | 1367 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1368 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1369 |
projectMenuSubversionCompare |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1370 |
|repo| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1371 |
repo := SVN::RepositoryManager |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1372 |
repositoryForPackage:self theSingleSelectedProject. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1373 |
(SVN::BranchAndRevisionSelectionDialog new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1374 |
title:'Compare ' , self theSingleSelectedProject asText allItalic; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1375 |
repository:repo; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1376 |
branch:repo trunk; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1377 |
onAccept: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1378 |
[:dlg | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1379 |
dlg showProgressWhile: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1380 |
[self projectMenuSubversionCompareWithBranch:dlg branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1381 |
revision:dlg revision]]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1382 |
open |
102 | 1383 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1384 |
"Created: / 20-05-2008 / 18:09:20 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1385 |
"Modified: / 02-11-2009 / 16:45:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1386 |
! ! |
1387 |
||
230 | 1388 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1389 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1390 |
projectMenuSubversionCompareWithBranch:branch revision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1391 |
|diffset| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1392 |
diffset := branch diffSetBetweenImageAndRevision:revision. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1393 |
(Tools::ChangeSetDiffTool new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1394 |
diffset:diffset; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1395 |
title:'Differences between image and rev. ' , revision printString; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1396 |
open |
102 | 1397 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1398 |
"Modified: / 09-08-2009 / 14:14:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1399 |
"Created: / 02-11-2009 / 13:41:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1400 |
"Modified: / 05-12-2009 / 11:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1401 |
"Modified: / 07-07-2011 / 23:08:37 / jv" |
102 | 1402 |
! ! |
1403 |
||
230 | 1404 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1405 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1406 |
projectMenuSubversionCompareWithRevisionHead |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1407 |
|branch| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1408 |
branch := (SVN::RepositoryManager |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1409 |
repositoryForPackage:self theSingleSelectedProject value) branch. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1410 |
SVN::ProgressDialog openOn: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1411 |
[self projectMenuSubversionCompareWithBranch:branch |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1412 |
revision:SVN::Revision head] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1413 |
title:'Comparing ' , self theSingleSelectedProject value asText allItalic. |
102 | 1414 |
|
1415 |
"Created: / 20-05-2008 / 18:10:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1416 |
"Modified: / 02-11-2009 / 13:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1417 |
! ! |
1418 |
||
230 | 1419 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1420 |
|
1421 |
projectMenuSubversionLoadRevision |
|
1422 |
||
1423 |
^self projectMenuSubversionLoadRevision: nil |
|
1424 |
||
1425 |
"Created: / 22-10-2008 / 11:49:35 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1426 |
"Modified: / 09-04-2009 / 09:38:17 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1427 |
! ! |
|
1428 |
||
230 | 1429 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1430 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1431 |
projectMenuSubversionLoadRevision:aRevision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1432 |
self selectedProjects value do:[:package | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1433 |
|pkg task| |
102 | 1434 |
|
105 | 1435 |
pkg := self theSingleSelectedProject. |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1436 |
task := (SVN::RepositoryManager repositoryForPackage:pkg) updateTask. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1437 |
task revision:aRevision. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1438 |
SVN::UpdateLikeWizard openOn:task |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1439 |
] |
102 | 1440 |
|
1441 |
"Created: / 09-04-2009 / 09:38:55 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1442 |
"Modified: / 25-11-2009 / 13:53:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1443 |
! ! |
1444 |
||
230 | 1445 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1446 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1447 |
projectMenuSubversionMergeWith:branch revision:revision |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1448 |
|package| |
102 | 1449 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1450 |
package := self theSingleSelectedProject. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1451 |
(SVN::UpdateLikeWizard new) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1452 |
task:branch repository workingCopy mergeTask; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1453 |
branch:branch; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1454 |
revision:revision; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1455 |
open |
102 | 1456 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1457 |
"Created: / 25-11-2009 / 16:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1458 |
"Modified: / 25-11-2009 / 20:10:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
102 | 1459 |
! ! |
1460 |
||
230 | 1461 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1462 |
|
1463 |
projectMenuSubversionRemoveWorkingCopy |
|
1464 |
||
1465 |
self selectedProjects value do: |
|
105 | 1466 |
[:package| |
1467 |
| pkg repo | |
|
1468 |
pkg := self theSingleSelectedProject. |
|
1469 |
repo := (SVN::RepositoryManager repositoryForPackage: pkg) . |
|
1470 |
repo workingCopy path asFilename recursiveRemove] |
|
102 | 1471 |
|
1472 |
"Created: / 09-04-2009 / 13:19:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1473 |
! ! |
|
1474 |
||
230 | 1475 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1476 |
|
1477 |
projectMenuSubversionShowRevisionLog |
|
1478 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1479 |
| pkg branch | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1480 |
pkg := self theSingleSelectedProjectForSubversion. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1481 |
branch := (self svnRepositoryFor: pkg) branch. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1482 |
SVN::RevisionLogBrowser new |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1483 |
branch: branch; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1484 |
open |
102 | 1485 |
|
1486 |
"Created: / 21-05-2008 / 09:37:51 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1487 |
"Modified: / 21-10-2008 / 19:52:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1488 |
! ! |
|
1489 |
||
230 | 1490 |
!Tools::NewSystemBrowser methodsFor:'menu actions-subversion-project'! |
102 | 1491 |
|
1492 |
projectMenuSubversionUpdate |
|
1493 |
||
1494 |
^self projectMenuSubversionLoadRevision: SVN::Revision head |
|
1495 |
||
1496 |
"Created: / 22-10-2008 / 11:49:35 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1497 |
"Modified: / 09-04-2009 / 09:38:34 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1498 |
! ! |
|
1499 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1500 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1501 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1502 |
projectSubversionChangesetMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1503 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1504 |
<resource: #programMenu > |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1505 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1506 |
|menu repo branches| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1507 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1508 |
menu := Menu decodeFromLiteralArray: self class projectSubversionChangesetMenu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1509 |
repo := SVN::RepositoryManager repositoryForPackage:self theSingleSelectedProject. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1510 |
branches := repo branches. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1511 |
branches size = 1 ifTrue:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1512 |
menu removeItemAt:2. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1513 |
^ menu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1514 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1515 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1516 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1517 |
branches do:[:branch | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1518 |
menu addItem: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1519 |
(MenuItem new |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1520 |
label: (LabelAndIcon |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1521 |
label: ('Changeset against ', branch name) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1522 |
icon: (branch icon)); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1523 |
value: [self projectMenuSubversionChangesetAgainstBranch: branch revision: SVN::Revision head]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1524 |
enabled: (repo branch = branch) not) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1525 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1526 |
^menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1527 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1528 |
"Created: / 25-11-2009 / 14:10:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1529 |
"Modified: / 25-11-2009 / 16:48:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1530 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1531 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1532 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1533 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1534 |
projectSubversionMergeMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1535 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1536 |
<resource: #programMenu > |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1537 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1538 |
|menu repo branches| |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1539 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1540 |
menu := Menu decodeFromLiteralArray: self class projectSubversionMergeMenu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1541 |
repo := SVN::RepositoryManager |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1542 |
repositoryForPackage:self theSingleSelectedProject. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1543 |
branches := repo branches. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1544 |
branches size = 1 ifTrue:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1545 |
menu removeItemAt:2. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1546 |
^ menu. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1547 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1548 |
branches do:[:branch | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1549 |
menu addItem: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1550 |
(MenuItem new |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1551 |
label: (LabelAndIcon |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1552 |
label: ('Merge with ', branch name) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1553 |
icon: (branch icon)); |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1554 |
value: [self projectMenuSubversionMergeWith: branch revision: SVN::Revision head]; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1555 |
enabled: (repo branch = branch) not) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1556 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1557 |
^menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1558 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1559 |
"Created: / 25-11-2009 / 14:10:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1560 |
"Modified: / 25-11-2009 / 16:48:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1561 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1562 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1563 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
102 | 1564 |
|
1565 |
selectedProjectSubversionRepository |
|
1566 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1567 |
| project | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1568 |
project := self theSingleSelectedProjectForSubversion. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1569 |
^project |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1570 |
ifNil:[nil] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1571 |
ifNotNil:[self svnRepositoryManager repositoryForPackage:project] |
102 | 1572 |
|
1573 |
"Created: / 19-04-2008 / 11:09:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1574 |
! ! |
|
1575 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1576 |
!Tools::NewSystemBrowser methodsFor:'aspects-navigation-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1577 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1578 |
selectedProjectsForSubversion |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1579 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1580 |
self selectedProjects value |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1581 |
ifNotNil:[^self selectedProjects value]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1582 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1583 |
self selectedClasses value |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1584 |
ifNotNil:[^(self selectedClasses value collect:[:cls|cls package]) asSet]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1585 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1586 |
^nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1587 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1588 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1589 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1590 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1591 |
selectedProjectsFromClasses |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1592 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1593 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1594 |
^(self selectedClasses value collect:[:cls|cls package] thenSelect:[:pkg|pkg notNil]) asSet |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1595 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1596 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1597 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1598 |
"Created: / 24.2.2000 / 21:51:33 / cg" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1599 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1600 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1601 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1602 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1603 |
svnRepositoryFor: packageId |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1604 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1605 |
^self svnRepositoryManager repositoryForPackage: packageId |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1606 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1607 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1608 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1609 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1610 |
svnRepositoryManager |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1611 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1612 |
"/ use Smalltalk-at to trick the dependency/prerequisite generator |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1613 |
^(Smalltalk at:#'SVN::RepositoryManager') |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1614 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1615 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1616 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1617 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1618 |
theSingleSelectedProjectForSubversion |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1619 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1620 |
| projects | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1621 |
projects := self selectedProjectsForSubversion. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1622 |
^projects size == 1 |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1623 |
ifTrue:[projects anyOne] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1624 |
ifFalse:[nil] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1625 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1626 |
"Created: / 24.2.2000 / 21:51:33 / cg" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1627 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1628 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1629 |
!Tools::NewSystemBrowser methodsFor:'private-helpers-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1630 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1631 |
theSingleSelectedProjectFromClasses |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1632 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1633 |
| projects | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1634 |
^(projects := self selectedProjectsFromClasses) size = 1 |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1635 |
ifTrue:[projects anyOne] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1636 |
ifFalse:[nil] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1637 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1638 |
|
264 | 1639 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
239 | 1640 |
|
1641 |
classMenuSubversion |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1642 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1643 |
<resource: #obsolete> |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1644 |
self obsoleteMethodWarning: 'use #classSubversionMenu'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1645 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1646 |
^self classSubversionMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1647 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1648 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1649 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1650 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1651 |
classSubversionChangesetMenu |
239 | 1652 |
"This resource specification was automatically generated |
1653 |
by the MenuEditor of ST/X." |
|
1654 |
||
1655 |
"Do not manually edit this!! If it is corrupted, |
|
1656 |
the MenuEditor may not be able to read the specification." |
|
1657 |
||
1658 |
" |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1659 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classSubversionChangesetMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1660 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classSubversionChangesetMenu)) startUp |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1661 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1662 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1663 |
<resource: #menu> |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1664 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1665 |
^ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1666 |
#(Menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1667 |
( |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1668 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1669 |
label: 'Changeset against...' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1670 |
itemValue: classMenuSubversionChangeset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1671 |
translateLabel: true |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1672 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1673 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1674 |
label: '-' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1675 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1676 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1677 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1678 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1679 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1680 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1681 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1682 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1683 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1684 |
classSubversionCompareMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1685 |
"This resource specification was automatically generated |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1686 |
by the MenuEditor of ST/X." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1687 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1688 |
"Do not manually edit this!! If it is corrupted, |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1689 |
the MenuEditor may not be able to read the specification." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1690 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1691 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1692 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classSubversionCompareMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1693 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classSubversionCompareMenu)) startUp |
239 | 1694 |
" |
1695 |
||
1696 |
<resource: #menu> |
|
1697 |
||
366 | 1698 |
^ |
239 | 1699 |
#(Menu |
366 | 1700 |
( |
1701 |
(MenuItem |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1702 |
enabled: hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1703 |
label: 'Compare...' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1704 |
itemValue: classMenuSubversionCompare |
366 | 1705 |
translateLabel: true |
1706 |
) |
|
1707 |
(MenuItem |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1708 |
enabled: hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1709 |
label: 'Compare with HEAD' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1710 |
itemValue: classMenuSubversionCompareWithRevisionHead |
366 | 1711 |
translateLabel: true |
1712 |
) |
|
1713 |
) |
|
1714 |
nil |
|
1715 |
nil |
|
239 | 1716 |
) |
1717 |
! ! |
|
1718 |
||
264 | 1719 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
239 | 1720 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1721 |
projectMenuSubversion |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1722 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1723 |
<resource: #obsolete> |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1724 |
self obsoleteMethodWarning: 'use #projectSubversionMenu'. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1725 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1726 |
^self projectSubversionMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1727 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1728 |
"Modified: / 04-12-2009 / 21:53:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1729 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1730 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1731 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1732 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1733 |
projectSubversionChangesetMenu |
239 | 1734 |
"This resource specification was automatically generated |
1735 |
by the MenuEditor of ST/X." |
|
1736 |
||
1737 |
"Do not manually edit this!! If it is corrupted, |
|
1738 |
the MenuEditor may not be able to read the specification." |
|
1739 |
||
1740 |
" |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1741 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#projectSubversionChangesetMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1742 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser projectSubversionChangesetMenu)) startUp |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1743 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1744 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1745 |
<resource: #menu> |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1746 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1747 |
^ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1748 |
#(Menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1749 |
( |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1750 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1751 |
label: 'Changeset against...' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1752 |
itemValue: projectMenuSubversionChangeset |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1753 |
translateLabel: true |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1754 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1755 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1756 |
label: '-' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1757 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1758 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1759 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1760 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1761 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1762 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1763 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1764 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1765 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1766 |
projectSubversionCompareMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1767 |
"This resource specification was automatically generated |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1768 |
by the MenuEditor of ST/X." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1769 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1770 |
"Do not manually edit this!! If it is corrupted, |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1771 |
the MenuEditor may not be able to read the specification." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1772 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1773 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1774 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#projectSubversionCompareMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1775 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser projectSubversionCompareMenu)) startUp |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1776 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1777 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1778 |
<resource: #menu> |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1779 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1780 |
^ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1781 |
#(Menu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1782 |
( |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1783 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1784 |
enabled: hasProjectSelectedSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1785 |
label: 'Compare...' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1786 |
itemValue: projectMenuSubversionCompare |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1787 |
translateLabel: true |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1788 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1789 |
(MenuItem |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1790 |
enabled: hasProjectSelectedSubversionRepositoryExistsAndBranchSelectedHolder |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1791 |
label: 'Compare with HEAD' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1792 |
itemValue: projectMenuSubversionCompareWithRevisionHead |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1793 |
translateLabel: true |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1794 |
auxValue: 'ni' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1795 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1796 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1797 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1798 |
nil |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1799 |
) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1800 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1801 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1802 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-subversion'! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1803 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1804 |
projectSubversionMergeMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1805 |
"This resource specification was automatically generated |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1806 |
by the MenuEditor of ST/X." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1807 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1808 |
"Do not manually edit this!! If it is corrupted, |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1809 |
the MenuEditor may not be able to read the specification." |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1810 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1811 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1812 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#projectSubversionMergeMenu |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1813 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser projectSubversionMergeMenu)) startUp |
239 | 1814 |
" |
1815 |
||
1816 |
<resource: #menu> |
|
1817 |
||
366 | 1818 |
^ |
239 | 1819 |
#(Menu |
584 | 1820 |
( |
1821 |
(MenuItem |
|
1822 |
enabled: false |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1823 |
label: 'Merge' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1824 |
itemValue: projectSubversionMergeMenu |
584 | 1825 |
translateLabel: true |
1826 |
) |
|
1827 |
(MenuItem |
|
1828 |
label: '-' |
|
1829 |
) |
|
1830 |
) |
|
1831 |
nil |
|
1832 |
nil |
|
239 | 1833 |
) |
1834 |
! ! |
|
1835 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1836 |
!UserNotification class methodsFor:'instance creation'! |
102 | 1837 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1838 |
notify: message progress: progress |
102 | 1839 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1840 |
^ProgressNotification new |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1841 |
messageText: message; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1842 |
parameter: progress; |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1843 |
raiseRequest |
102 | 1844 |
! ! |
1845 |
||
932 | 1846 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 1847 |
|
1056 | 1848 |
svnCommand |
1849 |
"Returns path svn executable" |
|
1850 |
||
1851 |
^self at:#svnCommand ifAbsent:[ nil ] |
|
1852 |
||
1853 |
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1854 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1855 |
"Created: / 12-03-2012 / 11:22:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1856 |
! ! |
|
1857 |
||
1858 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
1859 |
||
1860 |
svnCommand: aString |
|
1861 |
"Set the command to svn executable" |
|
1862 |
||
1863 |
^self at:#svnCommand put: aString |
|
1864 |
||
1865 |
" |
|
1866 |
UserPreferences current svnCommand |
|
1867 |
UserPreferences current svnCommand:'svn' |
|
1868 |
UserPreferences current svnCommand:nil |
|
1869 |
" |
|
1870 |
||
1871 |
"Created: / 12-03-2012 / 11:22:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1872 |
! ! |
|
1873 |
||
1874 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
1875 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1876 |
svnConfigurations2 |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1877 |
"subversion source control configurations" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1878 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1879 |
^(self at:#'libsvn.Configuration.configurations' ifAbsent: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1880 |
[Array with:(SVN::Configuration named: SVN::Configuration defaultName)]) |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1881 |
collect:[:cfg|cfg decodeAsLiteralArray] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1882 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1883 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1884 |
"Created: / 09-01-2010 / 15:34:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1885 |
"Modified: / 11-02-2010 / 18:56:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1886 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1887 |
|
932 | 1888 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1889 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1890 |
svnConfigurations2: aCollection |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1891 |
"subversion source control configurations" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1892 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1893 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1894 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1895 |
(Smalltalk at: #'SVN::Configuration') ifNotNil: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1896 |
[(Smalltalk at: #'SVN::Configuration') flushCaches; setConfigurations: aCollection]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1897 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1898 |
self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1899 |
at: #'libsvn.Configuration.configurations' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1900 |
put: (aCollection asArray collect:[:cfg|cfg literalArrayEncoding]). |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1901 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1902 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1903 |
UserPreferences current svnConfigurations2: #() |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1904 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1905 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1906 |
"Modified: / 19-08-2009 / 12:09:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1907 |
"Created: / 09-01-2010 / 15:41:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1908 |
"Modified: / 10-03-2010 / 13:26:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1909 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1910 |
|
932 | 1911 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 1912 |
|
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1913 |
svnCurrentConfiguration |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1914 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1915 |
| name confs conf | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1916 |
name := self at: #'libsvn.Configuration.current' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1917 |
ifAbsent:[SVN::Configuration defaultName]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1918 |
confs := SVN::Configuration configurations. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1919 |
conf := confs detect: [:c|c name = name] ifNone: [nil]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1920 |
conf ifNil: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1921 |
[confs size == 1 |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1922 |
ifTrue: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1923 |
[conf := confs anyOne] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1924 |
ifFalse: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1925 |
[conf := SVN::Configuration named: SVN::Configuration defaultName. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1926 |
confs := confs copyWith: conf. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1927 |
self svnConfigurations2: confs]]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1928 |
^conf |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1929 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1930 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1931 |
UserPreferences current svnCurrentConfiguration |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1932 |
" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1933 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1934 |
"Modified: / 19-08-2009 / 12:09:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1935 |
"Created: / 11-02-2010 / 18:54:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1936 |
"Modified: / 31-03-2011 / 14:18:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1937 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1938 |
|
932 | 1939 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1940 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1941 |
svnCurrentConfiguration: aConfiguration |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1942 |
"subversion source control configurations" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1943 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1944 |
| cName | |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1945 |
cName := aConfiguration isString |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1946 |
ifTrue:[aConfiguration] |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1947 |
ifFalse:[aConfiguration name]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1948 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1949 |
aConfiguration isString ifFalse:[ |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1950 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1951 |
(Smalltalk at: #'SVN::Configuration') ifNotNil: |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1952 |
[(Smalltalk at: #'SVN::Configuration') setCurrent: aConfiguration]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1953 |
]. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1954 |
self |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1955 |
at: #'libsvn.Configuration.current' |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1956 |
put: cName. |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1957 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1958 |
|
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1959 |
"Modified: / 19-08-2009 / 12:09:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1960 |
"Created: / 09-01-2010 / 15:41:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1961 |
"Modified: / 31-03-2011 / 14:25:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1962 |
! ! |
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
1963 |
|
932 | 1964 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 1965 |
|
1046 | 1966 |
svnDiff2Command |
1967 |
"Return external diff2 command passed to svn client" |
|
1968 |
||
1969 |
^self at:#svnDiff2Command ifAbsent:[nil] |
|
1970 |
||
1971 |
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1972 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1973 |
"Created: / 17-02-2012 / 01:29:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1974 |
! ! |
|
1975 |
||
1976 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
1977 |
||
1978 |
svnDiff2Command: aString |
|
1979 |
"Return external diff2 command passed to svn client" |
|
1980 |
||
1981 |
^self at:#svnDiff2Command put: aString |
|
1982 |
||
1983 |
" |
|
1984 |
UserPreferences current svnDiff2Command |
|
1985 |
UserPreferences current svnDiff2Command:'kdiff3' |
|
1986 |
UserPreferences current svnDiff2Command:nil |
|
1987 |
" |
|
1988 |
||
1989 |
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1990 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1991 |
"Created: / 17-02-2012 / 01:30:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1992 |
! ! |
|
1993 |
||
1994 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
1995 |
||
1996 |
svnDiff3Command |
|
1997 |
"Return external diff3 command passed to svn client" |
|
1998 |
||
1999 |
^self at:#svnDiff3Command ifAbsent:[nil] |
|
2000 |
||
2001 |
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2002 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2003 |
"Created: / 17-02-2012 / 01:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2004 |
! ! |
|
2005 |
||
2006 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
2007 |
||
2008 |
svnDiff3Command: aString |
|
2009 |
"Return external diff2 command passed to svn client" |
|
2010 |
||
2011 |
^self at:#svnDiff3Command put: aString |
|
2012 |
||
2013 |
" |
|
2014 |
UserPreferences current svnDiff3Command |
|
2015 |
UserPreferences current svnDiff3Command:'kdiff3' |
|
2016 |
UserPreferences current svnDiff3Command:nil |
|
2017 |
" |
|
2018 |
||
2019 |
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2020 |
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2021 |
"Created: / 17-02-2012 / 01:31:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2022 |
! ! |
|
2023 |
||
2024 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
|
2025 |
||
554 | 2026 |
svnEnabled |
2027 |
"subversion source control is enabled" |
|
2028 |
||
623
91422f26e1ea
merged with Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
590
diff
changeset
|
2029 |
^self at:#svnEnabled ifAbsent:[false] |
554 | 2030 |
|
2031 |
"Created: / 03-10-2008 / 11:11:39 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2032 |
! ! |
|
2033 |
||
932 | 2034 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 2035 |
|
2036 |
svnEnabled: aBoolean |
|
2037 |
"subversion source control is enabled" |
|
2038 |
||
2039 |
^self at:#svnEnabled put: aBoolean |
|
2040 |
||
2041 |
"Created: / 03-10-2008 / 11:13:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2042 |
! ! |
|
2043 |
||
932 | 2044 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 2045 |
|
2046 |
svnVerbose |
|
2047 |
"verbose messages from subversion source control (if enabled)" |
|
2048 |
||
2049 |
^self at:#svnVerbose ifAbsent: false |
|
2050 |
||
2051 |
"Created: / 19-03-2009 / 14:00:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2052 |
! ! |
|
2053 |
||
932 | 2054 |
!UserPreferences methodsFor:'accessing-scm-subversion'! |
554 | 2055 |
|
2056 |
svnVerbose: aBoolean |
|
2057 |
"verbose messages from subversion source control (if enabled)" |
|
2058 |
||
2059 |
^self at:#svnVerbose put: aBoolean |
|
2060 |
||
2061 |
"Created: / 19-03-2009 / 13:59:46 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2062 |
! ! |
|
2063 |
||
230 | 2064 |
!XML::NodeSet methodsFor:'navigation'! |
102 | 2065 |
|
105 | 2066 |
@ attributeName |
102 | 2067 |
"XPath like processing - if singleton set, answer an value of |
2068 |
atribute named attributeName, error otherwise. |
|
2069 |
This method is used in libsvn" |
|
2070 |
||
2071 |
self size = 1 ifTrue:[^self first @ attributeName]. |
|
2072 |
self error:'More than one element in node set' |
|
2073 |
! ! |
|
516 | 2074 |
|
2075 |
!stx_libsvn class methodsFor:'documentation'! |
|
2076 |
||
2077 |
extensionsVersion_CVS |
|
2078 |
^ '$Header$' |
|
590 | 2079 |
! ! |