author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 06 Dec 2012 17:48:06 +0000 | |
changeset 142 | 67e8c5ab8db2 |
parent 118 | 5a8b78ad48ae |
child 143 | 70e4bf961dec |
permissions | -rw-r--r-- |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1 |
"{ Package: 'stx:libscm/mercurial' }" |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
2 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
3 |
SCMAbstractCommitDialog subclass:#HGCommitDialog |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
4 |
instanceVariableNames:'defaultLogo' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
5 |
classVariableNames:'' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
6 |
poolDictionaries:'' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
7 |
category:'SCM-Mercurial-StX-Interface' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
8 |
! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
9 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
10 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
11 |
!HGCommitDialog class methodsFor:'image specs'! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
12 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
13 |
dialogIcon |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
14 |
^ HGIconLibrary hgLogo2 |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
15 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
16 |
"Created: / 14-11-2012 / 00:14:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
17 |
"Modified: / 16-11-2012 / 11:01:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
18 |
! ! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
19 |
|
55 | 20 |
!HGCommitDialog class methodsFor:'interface specs'! |
21 |
||
22 |
fileListColumnSpec |
|
23 |
"This resource specification was automatically generated |
|
24 |
by the DataSetBuilder of ST/X." |
|
25 |
||
26 |
"Do not manually edit this!! If it is corrupted, |
|
27 |
the DataSetBuilder may not be able to read the specification." |
|
28 |
||
29 |
" |
|
30 |
DataSetBuilder new openOnClass:SVN::CommitDialog2 andSelector:#fileListColumnSpec |
|
31 |
" |
|
32 |
||
33 |
<resource: #tableColumns> |
|
34 |
||
35 |
^#( |
|
36 |
(DataSetColumnSpec |
|
37 |
label: '' |
|
38 |
activeHelpKey: '' |
|
39 |
activeHelpKeyForLabel: '' |
|
40 |
labelButtonType: None |
|
41 |
width: 22 |
|
42 |
minWidth: 22 |
|
43 |
editorType: CheckToggle |
|
44 |
rendererType: CheckToggle |
|
45 |
model: include |
|
46 |
menuFromApplication: false |
|
47 |
printSelector: include |
|
48 |
showRowSeparator: false |
|
49 |
showColSeparator: false |
|
50 |
) |
|
51 |
(DataSetColumnSpec |
|
52 |
label: '' |
|
53 |
activeHelpKey: '' |
|
54 |
activeHelpKeyForLabel: '' |
|
55 |
labelButtonType: Button |
|
56 |
width: 22 |
|
57 |
minWidth: 22 |
|
58 |
menuFromApplication: false |
|
59 |
printSelector: statusIcon |
|
60 |
canSelect: false |
|
61 |
showRowSeparator: false |
|
62 |
showColSeparator: false |
|
63 |
) |
|
64 |
(DataSetColumnSpec |
|
65 |
label: 'Container' |
|
66 |
labelAlignment: left |
|
67 |
activeHelpKey: '' |
|
68 |
activeHelpKeyForLabel: '' |
|
69 |
labelButtonType: Button |
|
70 |
menuFromApplication: false |
|
71 |
printSelector: pathText |
|
72 |
canSelect: false |
|
73 |
showRowSeparator: false |
|
74 |
showColSeparator: false |
|
75 |
) |
|
76 |
" |
|
77 |
(DataSetColumnSpec |
|
78 |
label: 'Rev' |
|
79 |
activeHelpKey: '' |
|
80 |
activeHelpKeyForLabel: '' |
|
81 |
labelButtonType: Button |
|
82 |
usePreferredWidth: true |
|
83 |
menuFromApplication: false |
|
84 |
printSelector: revision |
|
85 |
canSelect: false |
|
86 |
showRowSeparator: false |
|
87 |
showColSeparator: false |
|
88 |
) |
|
89 |
(DataSetColumnSpec |
|
90 |
label: 'Author' |
|
91 |
labelAlignment: left |
|
92 |
activeHelpKey: '' |
|
93 |
activeHelpKeyForLabel: '' |
|
94 |
labelButtonType: Button |
|
95 |
usePreferredWidth: true |
|
96 |
menuFromApplication: false |
|
97 |
printSelector: author |
|
98 |
canSelect: false |
|
99 |
showRowSeparator: false |
|
100 |
showColSeparator: false |
|
101 |
) |
|
102 |
(DataSetColumnSpec |
|
103 |
label: 'Date' |
|
104 |
activeHelpKey: '' |
|
105 |
activeHelpKeyForLabel: '' |
|
106 |
labelButtonType: Button |
|
107 |
usePreferredWidth: true |
|
108 |
menuFromApplication: false |
|
109 |
printSelector: date |
|
110 |
canSelect: false |
|
111 |
showRowSeparator: false |
|
112 |
showColSeparator: false |
|
113 |
) |
|
114 |
" |
|
115 |
) |
|
116 |
||
117 |
"Created: / 15-11-2012 / 09:28:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
118 |
! ! |
|
119 |
||
142
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
120 |
!HGCommitDialog methodsFor:'actions'! |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
121 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
122 |
doShowDiffsForEntry: wcentry against: rev |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
123 |
|wc wcChangeSet repoentry repoChangeSet diffset | |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
124 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
125 |
wc := self task workingCopy. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
126 |
repoentry := [ rev / wcentry pathNameRelativeSlashed ] on: HGError do: [ |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
127 |
Dialog warn: 'File does not exists in changeset ' , rev id printString. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
128 |
]. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
129 |
wcentry suffix = SmalltalkLanguage instance sourceFileSuffix ifTrue:[ |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
130 |
wcChangeSet := ChangeSet fromFile: wcentry . |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
131 |
wcChangeSet name: wcChangeSet name, (resources string: ' (working copy - to be commited)'). |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
132 |
repoChangeSet := ChangeSet fromStream: repoentry contents asString readStream. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
133 |
diffset := ChangeSetDiff versionA:wcChangeSet versionB:repoChangeSet. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
134 |
(Tools::ChangeSetDiffTool new) |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
135 |
beSingleColumn; |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
136 |
diffset:diffset; |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
137 |
title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcentry pathNameRelative with: rev printString); |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
138 |
showVersionMethodDiffs: false; |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
139 |
open |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
140 |
] ifFalse:[ |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
141 |
| text1 text2 | |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
142 |
text1 := wcentry contents asString. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
143 |
text2 := repoentry contents asString. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
144 |
"/Argh...backward compatibility..." |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
145 |
(Tools::TextDiff2Tool ? Tools::TextDiffTool) new |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
146 |
labelA: 'Working copy'; |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
147 |
labelB: ('r %1' bindWith: rev printString); |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
148 |
textA: text1; textB: text2; |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
149 |
title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcentry pathNameRelative with: rev printString); |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
150 |
open |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
151 |
] |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
152 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
153 |
"Created: / 09-02-2012 / 14:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
154 |
"Modified: / 06-12-2012 / 17:19:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
155 |
! ! |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
118
diff
changeset
|
156 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
157 |
!HGCommitDialog methodsFor:'change & update'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
158 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
159 |
updateFileList |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
160 |
| wcroot statuses entries showOnlyModified wcrootPathNameRelative wcrootPathNameRelativeLen | |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
161 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
162 |
showOnlyModified := fileListShowOnlyModifiedHolder value. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
163 |
"HACK..." |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
164 |
|
118
5a8b78ad48ae
Refactoring (part 2): Rename SCMAbstractPackageModel>>workingCopy to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
165 |
wcroot := self model package temporaryWorkingCopyRoot. |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
166 |
wcrootPathNameRelative := wcroot pathNameRelative. |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
167 |
wcrootPathNameRelativeLen := wcrootPathNameRelative size. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
168 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
169 |
statuses := HGCommand status |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
170 |
workingDirectory: wcroot pathName; |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
171 |
execute. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
172 |
entries := OrderedCollection new: statuses size. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
173 |
statuses do:[:statusAndPath| |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
174 |
(fileListShowOnlyModifiedHolder value not |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
175 |
or:[statusAndPath first isCleanOrIgnored not]) ifTrue:[ |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
176 |
| nm entry | |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
177 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
178 |
(statusAndPath second startsWith: wcrootPathNameRelative) ifTrue:[ |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
179 |
nm := statusAndPath second. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
180 |
wcrootPathNameRelativeLen ~~ 0 ifTrue:[ |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
181 |
nm := nm copyFrom:wcrootPathNameRelativeLen + 2. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
182 |
]. |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
183 |
entry := SCMAbstractCommitDialog::FileEntry application: self entry: wcroot / nm name: nm. |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
184 |
entries add: entry |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
185 |
]. |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
186 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
187 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
188 |
self fileListHolder value: entries |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
189 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
190 |
"Created: / 08-02-2012 / 18:05:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
118
5a8b78ad48ae
Refactoring (part 2): Rename SCMAbstractPackageModel>>workingCopy to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
191 |
"Modified: / 01-12-2012 / 00:48:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
192 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
193 |
|
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
194 |
!HGCommitDialog methodsFor:'private'! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
195 |
|
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
196 |
doUpdateWorkingCopy |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
197 |
| heads changeset | |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
198 |
|
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
199 |
super doUpdateWorkingCopy. |
118
5a8b78ad48ae
Refactoring (part 2): Rename SCMAbstractPackageModel>>workingCopy to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
200 |
heads := self task package temporaryWorkingCopy heads. |
5a8b78ad48ae
Refactoring (part 2): Rename SCMAbstractPackageModel>>workingCopy to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
201 |
changeset := self task package temporaryWorkingCopy changeset. |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
202 |
(heads includes: changeset) ifFalse:[ |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
203 |
self infoPanel |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
204 |
reset; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
205 |
beInformation; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
206 |
message: (self resources string:'Comitting a new head.'); |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
207 |
addButtonWithLabel: (self resources string:'Proceed') action: [self infoPanel hide]; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
208 |
addButtonWithLabel: (self resources string:'Cancel') action:[self doCancel]; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
209 |
show. |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
210 |
] |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
211 |
|
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
212 |
"Created: / 27-11-2012 / 23:36:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
118
5a8b78ad48ae
Refactoring (part 2): Rename SCMAbstractPackageModel>>workingCopy to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
213 |
"Modified: / 01-12-2012 / 00:49:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
214 |
! ! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
215 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
216 |
!HGCommitDialog class methodsFor:'documentation'! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
217 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
218 |
version_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
219 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
220 |
^ '$Changeset: <not expanded> $' |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
221 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
222 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
223 |
version_SVN |
55 | 224 |
^ '§Id:: §' |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
225 |
! ! |