author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Mon, 12 Feb 2018 22:31:32 +0000 | |
changeset 813 | dab0996374c8 |
parent 809 | 1bbcf42198c6 |
child 914 | 04391080b32d |
permissions | -rw-r--r-- |
210 | 1 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
2 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
406
diff
changeset
|
3 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
4 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
5 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
6 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
7 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
8 |
version 2.1 of the License. |
210 | 9 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
10 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
11 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
12 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
13 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
14 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
15 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
16 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 18 |
" |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
19 |
"{ Package: 'stx:libscm/mercurial' }" |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
20 |
|
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
21 |
"{ NameSpace: Smalltalk }" |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
22 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
23 |
SCMAbstractCommitDialog subclass:#HGCommitDialog |
152
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
24 |
instanceVariableNames:'remoteHolder remoteListHolder remotePushHolder branchCreateHolder |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
25 |
branchHolder moreOptionsHolder amendHolder amendLabel |
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
26 |
bookmarkCreateHolder bookmarkHolder commitingNewHeadAcknowledged' |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
27 |
classVariableNames:'' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
28 |
poolDictionaries:'' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
29 |
category:'SCM-Mercurial-StX-Interface' |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
30 |
! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
31 |
|
210 | 32 |
!HGCommitDialog class methodsFor:'documentation'! |
33 |
||
34 |
copyright |
|
35 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
36 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
406
diff
changeset
|
37 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
38 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
39 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
40 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
41 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
42 |
version 2.1 of the License. |
210 | 43 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
44 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
45 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
46 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
47 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
48 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
49 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
50 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
51 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 52 |
" |
53 |
! ! |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
54 |
|
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
55 |
!HGCommitDialog class methodsFor:'help specs'! |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
56 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
57 |
helpSpec |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
58 |
"This resource specification was automatically generated |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
59 |
by the UIHelpTool of ST/X." |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
60 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
61 |
"Do not manually edit this!! If it is corrupted, |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
62 |
the UIHelpTool may not be able to read the specification." |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
63 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
64 |
" |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
65 |
UIHelpTool openOnClass:HGCommitDialog |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
66 |
" |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
67 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
68 |
<resource: #help> |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
69 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
70 |
^ super helpSpec addPairsFrom:#( |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
71 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
72 |
#amendLabelHelp |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
73 |
'Changeset to amend' |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
74 |
|
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
75 |
#bookmarkCreateHelp |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
76 |
'' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
77 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
78 |
#bookmarkHelp |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
79 |
'When checked, commited changeset will be assigned a bookmark.\\Usefull when one uses feature-branch like model.' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
80 |
|
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
81 |
) |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
82 |
! ! |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
83 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
84 |
!HGCommitDialog class methodsFor:'image specs'! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
85 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
86 |
dialogIcon |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
87 |
^ HGIconLibrary hgLogo2 |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
88 |
|
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
89 |
"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
|
90 |
"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
|
91 |
! ! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
92 |
|
55 | 93 |
!HGCommitDialog class methodsFor:'interface specs'! |
94 |
||
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
95 |
contentSpec |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
96 |
"This resource specification was automatically generated |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
97 |
by the UIPainter of ST/X." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
98 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
99 |
"Do not manually edit this!! If it is corrupted, |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
100 |
the UIPainter may not be able to read the specification." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
101 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
102 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
103 |
UIPainter new openOnClass:HGCommitDialog andSelector:#contentSpec |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
104 |
HGCommitDialog new openInterface:#contentSpec |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
105 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
106 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
107 |
<resource: #canvas> |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
108 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
109 |
^ |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
110 |
#(FullSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
111 |
name: contentSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
112 |
window: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
113 |
(WindowSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
114 |
label: 'Commit...' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
115 |
name: 'Commit...' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
116 |
min: (Point 10 10) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
117 |
bounds: (Rectangle 0 0 698 603) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
118 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
119 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
120 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
121 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
122 |
(VariableVerticalPanelSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
123 |
name: 'VariablePanel' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
124 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
125 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
126 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
127 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
128 |
(VerticalPanelViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
129 |
name: 'VerticalPanel1' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
130 |
horizontalLayout: fit |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
131 |
verticalLayout: bottomSpaceFit |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
132 |
horizontalSpace: 3 |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
133 |
verticalSpace: 3 |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
134 |
elementsChangeSize: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
135 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
136 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
137 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
138 |
(ViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
139 |
name: 'MessageAndInfoPane' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
140 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
141 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
142 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
143 |
(SubCanvasSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
144 |
name: 'InfoPanel' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
145 |
layout: (LayoutFrame 0 0 0 0 0 1 40 0) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
146 |
level: 0 |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
147 |
initiallyInvisible: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
148 |
hasHorizontalScrollBar: false |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
149 |
hasVerticalScrollBar: false |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
150 |
clientKey: infoPanel |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
151 |
createNewBuilder: false |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
152 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
153 |
(ViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
154 |
name: 'MessagePane' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
155 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
156 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
157 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
158 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
159 |
(LabelSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
160 |
label: 'Commit message:' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
161 |
name: 'MessageLabel' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
162 |
layout: (LayoutFrame 0 0 0 0 0 1 25 0) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
163 |
translateLabel: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
164 |
adjust: left |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
165 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
166 |
(LinkButtonSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
167 |
label: 'More Options' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
168 |
name: 'MoreOptions' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
169 |
layout: (LayoutFrame -100 1 0 0 0 1 30 0) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
170 |
visibilityChannel: moreOptionsHiddenHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
171 |
translateLabel: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
172 |
labelChannel: moreOptionsLabel |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
173 |
adjust: right |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
174 |
model: doShowMoreOptions |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
175 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
176 |
(TextEditorSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
177 |
name: 'Message' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
178 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
179 |
enableChannel: enabledHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
180 |
hasHorizontalScrollBar: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
181 |
hasVerticalScrollBar: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
182 |
modifiedChannel: messageModifiedHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
183 |
hasKeyboardFocusInitially: false |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
184 |
postBuildCallback: messageView: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
185 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
186 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
187 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
188 |
) |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
189 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
190 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
191 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
192 |
) |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
193 |
extent: (Point 698 188) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
194 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
195 |
(ViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
196 |
name: 'AmendBox' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
197 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
198 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
199 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
200 |
(CheckBoxSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
201 |
label: 'Amend Commit' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
202 |
name: 'AmendCheckBox' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
203 |
layout: (LayoutFrame 0 0 2 0 0 1 25 0) |
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
204 |
activeHelpKey: amendLabelHelp |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
205 |
visibilityChannel: canAmendHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
206 |
model: amendHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
207 |
translateLabel: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
208 |
labelChannel: amendLabel |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
209 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
210 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
211 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
212 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
213 |
extent: (Point 698 25) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
214 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
215 |
(ViewSpec |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
216 |
name: 'BookmarkBox' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
217 |
component: |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
218 |
(SpecCollection |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
219 |
collection: ( |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
220 |
(CheckBoxSpec |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
221 |
label: 'Bookmark' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
222 |
name: 'CheckBox2' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
223 |
layout: (LayoutFrame 0 0 2 0 215 0 25 0) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
224 |
activeHelpKey: bookmarkHelp |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
225 |
model: bookmarkCreateHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
226 |
translateLabel: true |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
227 |
) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
228 |
(ComboBoxSpec |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
229 |
name: 'ComboBox1' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
230 |
layout: (LayoutFrame 215 0 0 0 0 1 0 1) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
231 |
activeHelpKey: bookmarkHelp |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
232 |
enableChannel: bookmarkCreateHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
233 |
model: bookmarkHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
234 |
emptyFieldReplacementText: 'Bookmark name' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
235 |
comboList: bookmarkList |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
236 |
) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
237 |
) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
238 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
239 |
) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
240 |
extent: (Point 698 24) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
241 |
) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
242 |
(ViewSpec |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
243 |
name: 'BranchBox' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
244 |
visibilityChannel: moreOptionsVisibleHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
245 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
246 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
247 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
248 |
(CheckBoxSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
249 |
label: 'Commit into new branch' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
250 |
name: 'BranchCheckBox' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
251 |
layout: (LayoutFrame 0 0 2 0 215 0 25 0) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
252 |
model: branchCreateHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
253 |
translateLabel: true |
152
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
254 |
) |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
255 |
(InputFieldSpec |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
256 |
name: 'EntryField1' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
257 |
layout: (LayoutFrame 215 0 0 0 0 1 0 1) |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
258 |
enableChannel: branchCreateHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
259 |
model: branchHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
260 |
emptyFieldReplacementText: 'Branch name' |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
261 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
262 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
263 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
264 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
265 |
extent: (Point 698 25) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
266 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
267 |
(ViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
268 |
name: 'PushBox' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
269 |
visibilityChannel: moreOptionsVisibleHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
270 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
271 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
272 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
273 |
(CheckBoxSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
274 |
label: 'Push to upstream repository' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
275 |
name: 'CheckBox1' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
276 |
layout: (LayoutFrame 0 0 2 0 215 0 25 0) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
277 |
model: remotePushHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
278 |
translateLabel: true |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
279 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
280 |
(ComboListSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
281 |
name: 'ComboList2' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
282 |
layout: (LayoutFrame 215 0 0 0 0 1 0 1) |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
283 |
enableChannel: remotePushHolder |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
284 |
model: remoteHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
285 |
comboList: remoteListHolder |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
286 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
287 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
288 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
289 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
290 |
extent: (Point 698 25) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
291 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
292 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
293 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
294 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
295 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
296 |
(ViewSpec |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
297 |
name: 'FilePane' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
298 |
component: |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
299 |
(SpecCollection |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
300 |
collection: ( |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
301 |
(UISubSpecification |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
302 |
name: 'FilePaneSpec' |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
303 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
304 |
minorKey: filePaneSpec |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
305 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
306 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
307 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
308 |
) |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
309 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
310 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
311 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
312 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
313 |
handles: (Any 0.5 1.0) |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
314 |
) |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
315 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
316 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
317 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
318 |
) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
319 |
! ! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
320 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
321 |
!HGCommitDialog methodsFor:'accessing'! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
322 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
323 |
task: anHGCommitTask |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
324 |
super task: anHGCommitTask. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
325 |
self updateAmendLabel. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
326 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
327 |
"Created: / 25-08-2015 / 12:48:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
55 | 328 |
! ! |
329 |
||
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
|
330 |
!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
|
331 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
332 |
doAccept |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
333 |
self task amend: self amendHolder value. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
334 |
|
152
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
335 |
self remotePushHolder value |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
336 |
ifTrue:[self task remote: self remoteHolder value] |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
337 |
ifFalse:[self task remote: nil]. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
338 |
self branchCreateHolder value |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
339 |
ifTrue:[self task branch: self branchHolder value] |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
340 |
ifFalse:[self task branch: nil]. |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
341 |
self bookmarkCreateHolder value notEmptyOrNil |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
342 |
ifTrue:[ self task bookmark: self bookmarkHolder value ] |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
343 |
ifFalse:[ self task bookmark: nil ]. |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
344 |
[ |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
345 |
super doAccept. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
346 |
] on: HGPushWouldCreateNewHeadError do:[:ex| |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
347 |
self infoPanel |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
348 |
reset; |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
349 |
beWarning; |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
350 |
message: (self resources string:'Push to upstream would create a new head. Changes were not pushed.'); |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
351 |
addButtonOK; |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
352 |
show. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
353 |
] |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
354 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
355 |
"Created: / 10-12-2012 / 01:46:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
356 |
"Modified: / 27-06-2016 / 18:12:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
357 |
! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
358 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
359 |
doEditUserConfig |
375
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
360 |
HGSourceCodeManagementSettingsAppl new doEditHGRC. |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
361 |
self doCancel. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
362 |
|
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
363 |
"Created: / 07-12-2012 / 16:08:02 / jv" |
375
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
364 |
"Modified: / 18-02-2014 / 10:35:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
365 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
366 |
|
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
367 |
doShowDiffsForEntry |
333 | 368 |
| selection | |
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
369 |
|
333 | 370 |
selection := self fileSelectionHolder value. |
371 |
selection isNil ifTrue:[ ^ self ]. |
|
372 |
selection isCollection ifTrue:[ |
|
373 |
selection do:[:each| |
|
374 |
self doShowDiffsForEntry: each entry against: each entry changeset |
|
375 |
] |
|
376 |
] ifFalse:[ |
|
377 |
self doShowDiffsForEntry: selection entry against: selection entry changeset |
|
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
378 |
]. |
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
379 |
|
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
380 |
"Created: / 09-02-2012 / 14:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333 | 381 |
"Modified: / 11-07-2013 / 02:06:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
382 |
! |
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
383 |
|
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
|
384 |
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
|
385 |
|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
|
386 |
|
185
b566a1c31bc8
Bugfix: HGCommitDialog>>#doShowDiffsForEntry:against: use #temporaryWorkingCopy.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
387 |
wc := self task temporaryWorkingCopy. |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
388 |
repoentry := nil. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
389 |
rev id isNull ifFalse:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
390 |
[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
391 |
repoentry := rev / wcentry pathNameRelativeSlashed |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
392 |
] on: HGError do: [ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
393 |
"/ No such file in given revision... |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
394 |
]. |
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
|
395 |
]. |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
396 |
|
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
|
397 |
wcentry suffix = SmalltalkLanguage instance sourceFileSuffix ifTrue:[ |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
398 |
wcentry exists ifTrue:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
399 |
wcChangeSet := ChangeSet fromFile: wcentry. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
400 |
] ifFalse:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
401 |
wcChangeSet := ChangeSet new. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
402 |
]. |
311
e8f38dd4af64
Fix for Smalltalk/X 6.2.2 in HGCommitDialog>>#doShowDiffsForEntry:against:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
403 |
wcChangeSet name: wcentry baseName, (resources string: ' (working copy - to be commited)'). |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
404 |
repoentry notNil ifTrue:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
405 |
repoChangeSet := ChangeSet fromStream: repoentry contents asString readStream. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
406 |
] ifFalse:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
407 |
repoChangeSet := ChangeSet new. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
408 |
]. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
409 |
repoChangeSet name: wcentry baseName, ' (revision ' , rev id printString , ')'. |
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
|
410 |
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
|
411 |
(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
|
412 |
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
|
413 |
diffset:diffset; |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
414 |
title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcentry pathNameRelative with: rev id printString); |
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
|
415 |
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
|
416 |
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
|
417 |
] 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
|
418 |
| text1 text2 | |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
419 |
|
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
420 |
wcentry exists ifTrue:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
421 |
text1 := wcentry contents asString. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
422 |
] ifFalse:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
423 |
text1 := ''. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
424 |
]. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
425 |
repoentry notNil ifTrue:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
426 |
text2 := repoentry contents asString. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
427 |
] ifFalse:[ |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
428 |
text2 := ''. |
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
429 |
]. |
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
|
430 |
"/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
|
431 |
(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
|
432 |
labelA: 'Working copy'; |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
433 |
labelB: ('Revision %1' bindWith: rev id printString); |
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
|
434 |
textA: text1; textB: text2; |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
435 |
title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcentry pathNameRelative with: rev id printString); |
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
|
436 |
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
|
437 |
] |
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
|
438 |
|
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
|
439 |
"Created: / 09-02-2012 / 14:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
406
f52fedd27727
Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
440 |
"Modified: / 26-03-2014 / 14:44:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
441 |
! |
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
442 |
|
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
443 |
doShowDiffsForEntryAgainstHEAD |
333 | 444 |
| selection | |
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
445 |
|
333 | 446 |
selection := self fileSelectionHolder value. |
447 |
selection isNil ifTrue:[ ^ self ]. |
|
448 |
selection isCollection ifTrue:[ |
|
449 |
selection do:[:each| |
|
450 |
self doShowDiffsForEntry: each entry against: self workingCopy heads anElement |
|
451 |
] |
|
452 |
] ifFalse:[ |
|
453 |
self doShowDiffsForEntry: selection entry against: self workingCopy heads anElement |
|
143
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
454 |
]. |
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
455 |
|
70e4bf961dec
Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
456 |
"Created: / 10-02-2012 / 10:00:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333 | 457 |
"Modified: / 11-07-2013 / 02:06:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
157
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
458 |
! |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
459 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
460 |
doShowMoreOptions |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
461 |
self moreOptionsHolder value: true |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
462 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
463 |
"Created: / 10-12-2012 / 11:39:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
809
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
464 |
! |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
465 |
|
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
466 |
doUpdateLogicalRevisionTo: revision |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
467 |
self task doUpdateLogicalRevisionTo: revision |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
468 |
|
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
469 |
"Created: / 09-02-2018 / 09:01:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
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
|
470 |
! ! |
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
|
471 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
472 |
!HGCommitDialog methodsFor:'aspects'! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
473 |
|
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
474 |
amendHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
475 |
<resource: #uiAspect> |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
476 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
477 |
amendHolder isNil ifTrue:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
478 |
amendHolder := false asValue. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
479 |
amendHolder addDependent:self. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
480 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
481 |
^ amendHolder. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
482 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
483 |
"Modified: / 25-08-2015 / 11:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
484 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
485 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
486 |
amendLabel |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
487 |
<resource: #uiAspect> |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
488 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
489 |
amendLabel isNil ifTrue:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
490 |
amendLabel := ValueHolder with: (resources string: 'Amend Previous Commit'). |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
491 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
492 |
^ amendLabel. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
493 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
494 |
"Modified: / 25-08-2015 / 12:47:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
495 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
496 |
|
687
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
497 |
bookmarkCreateHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
498 |
<resource: #uiAspect> |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
499 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
500 |
bookmarkCreateHolder isNil ifTrue:[ |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
501 |
bookmarkCreateHolder := false asValue. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
502 |
]. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
503 |
^ bookmarkCreateHolder. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
504 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
505 |
"Modified: / 27-06-2016 / 12:13:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
506 |
! |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
507 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
508 |
bookmarkHolder |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
509 |
<resource: #uiAspect> |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
510 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
511 |
"automatically generated by UIPainter ..." |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
512 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
513 |
"*** the code below creates a default model when invoked." |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
514 |
"*** (which may not be the one you wanted)" |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
515 |
"*** Please change as required and accept it in the browser." |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
516 |
"*** (and replace this comment by something more useful ;-)" |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
517 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
518 |
bookmarkHolder isNil ifTrue:[ |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
519 |
bookmarkHolder := ValueHolder new. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
520 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
521 |
"/ bookmarkHolder addDependent:self. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
522 |
"/ bookmarkHolder onChangeSend:#bookmarkHolderChanged to:self. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
523 |
]. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
524 |
^ bookmarkHolder. |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
525 |
! |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
526 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
527 |
bookmarkList |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
528 |
<resource: #uiAspect> |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
529 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
530 |
^ self task repository bookmarks |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
531 |
|
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
532 |
"Created: / 27-06-2016 / 12:16:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
533 |
! |
744539f5b8c7
Added support to add (move) bookmark when commiting a new changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
602
diff
changeset
|
534 |
|
152
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
535 |
branchCreateHolder |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
536 |
<resource: #uiAspect> |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
537 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
538 |
"automatically generated by UIPainter ..." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
539 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
540 |
"*** the code below creates a default model when invoked." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
541 |
"*** (which may not be the one you wanted)" |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
542 |
"*** Please change as required and accept it in the browser." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
543 |
"*** (and replace this comment by something more useful ;-)" |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
544 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
545 |
branchCreateHolder isNil ifTrue:[ |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
546 |
branchCreateHolder := false asValue. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
547 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
548 |
"/ branchCreateHolder addDependent:self. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
549 |
"/ branchCreateHolder onChangeSend:#branchCreateHolderChanged to:self. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
550 |
]. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
551 |
^ branchCreateHolder. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
552 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
553 |
"Modified: / 10-12-2012 / 02:54:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
554 |
! |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
555 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
556 |
branchHolder |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
557 |
<resource: #uiAspect> |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
558 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
559 |
"automatically generated by UIPainter ..." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
560 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
561 |
"*** the code below creates a default model when invoked." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
562 |
"*** (which may not be the one you wanted)" |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
563 |
"*** Please change as required and accept it in the browser." |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
564 |
"*** (and replace this comment by something more useful ;-)" |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
565 |
|
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
566 |
branchHolder isNil ifTrue:[ |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
567 |
branchHolder := ValueHolder new. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
568 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
569 |
"/ branchHolder addDependent:self. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
570 |
"/ branchHolder onChangeSend:#branchHolderChanged to:self. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
571 |
]. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
572 |
^ branchHolder. |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
573 |
! |
9068fe7a5795
Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
574 |
|
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
575 |
canAmendHolder |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
576 |
^ self task isAmendable |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
577 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
578 |
"Created: / 25-08-2015 / 11:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
579 |
"Modified: / 27-08-2015 / 18:16:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
580 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
581 |
|
157
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
582 |
moreOptionsHiddenHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
583 |
^BlockValue forLogicalNot: self moreOptionsVisibleHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
584 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
585 |
"Created: / 10-12-2012 / 11:37:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
586 |
! |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
587 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
588 |
moreOptionsHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
589 |
"return/create the 'moreOptionsHolder' value holder (automatically generated)" |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
590 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
591 |
moreOptionsHolder isNil ifTrue:[ |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
592 |
moreOptionsHolder := false asValue |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
593 |
]. |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
594 |
^ moreOptionsHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
595 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
596 |
"Modified: / 10-12-2012 / 11:38:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
597 |
! |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
598 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
599 |
moreOptionsLabel |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
600 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
601 |
^(resources string: 'More Options') asText |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
602 |
colorizeAllWith: Color blue; |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
603 |
actionForAll:[ self doShowMoreOptions ]; |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
604 |
yourself |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
605 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
606 |
"Created: / 10-12-2012 / 11:39:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
607 |
! |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
608 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
609 |
moreOptionsVisibleHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
610 |
^self moreOptionsHolder |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
611 |
|
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
612 |
"Created: / 10-12-2012 / 11:36:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
613 |
! |
fb7a41a9cf92
HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
152
diff
changeset
|
614 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
615 |
remoteHolder |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
616 |
<resource: #uiAspect> |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
617 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
618 |
"automatically generated by UIPainter ..." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
619 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
620 |
"*** the code below creates a default model when invoked." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
621 |
"*** (which may not be the one you wanted)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
622 |
"*** Please change as required and accept it in the browser." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
623 |
"*** (and replace this comment by something more useful ;-)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
624 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
625 |
remoteHolder isNil ifTrue:[ |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
626 |
| remote | |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
627 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
375
diff
changeset
|
628 |
remote := self task isPackageCommit ifTrue:[self task repository remoteDefault] ifFalse:[nil]. |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
629 |
remoteHolder := remote asValue. |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
630 |
]. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
631 |
^ remoteHolder. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
632 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
375
diff
changeset
|
633 |
"Modified: / 22-02-2014 / 23:47:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
634 |
! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
635 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
636 |
remoteListHolder |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
637 |
<resource: #uiAspect> |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
638 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
639 |
"automatically generated by UIPainter ..." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
640 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
641 |
"*** the code below creates a default model when invoked." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
642 |
"*** (which may not be the one you wanted)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
643 |
"*** Please change as required and accept it in the browser." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
644 |
"*** (and replace this comment by something more useful ;-)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
645 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
646 |
remoteListHolder isNil ifTrue:[ |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
647 |
| remoteList | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
648 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
375
diff
changeset
|
649 |
remoteList := self task isPackageCommit ifTrue:[self task repository remotes] ifFalse:[nil]. |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
650 |
remoteListHolder := remoteList asValue |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
651 |
]. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
652 |
^ remoteListHolder. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
653 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
375
diff
changeset
|
654 |
"Modified: / 22-02-2014 / 23:47:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
655 |
! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
656 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
657 |
remotePushHolder |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
658 |
<resource: #uiAspect> |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
659 |
"automatically generated by UIPainter ..." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
660 |
"*** the code below creates a default model when invoked." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
661 |
"*** (which may not be the one you wanted)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
662 |
"*** Please change as required and accept it in the browser." |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
663 |
"*** (and replace this comment by something more useful ;-)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
664 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
665 |
remotePushHolder isNil ifTrue:[ |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
666 |
remotePushHolder := UserPreferences current hgAutopush asValue. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
667 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
668 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
669 |
"/ pushHolder addDependent:self. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
670 |
"/ pushHolder onChangeSend:#pushHolderChanged to:self. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
671 |
]. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
672 |
^ remotePushHolder. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
673 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
674 |
"Modified: / 10-12-2012 / 01:25:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
675 |
! ! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
676 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
677 |
!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
|
678 |
|
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
679 |
update:aspect with:param from:sender |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
680 |
sender == amendHolder ifTrue:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
681 |
self updateMessage. |
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
682 |
self doCheckHead. |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
683 |
^ self. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
684 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
685 |
super update:aspect with:param from:sender |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
686 |
|
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
687 |
"Modified: / 12-02-2018 / 19:00:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
688 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
689 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
690 |
updateAmendLabel |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
691 |
| rev cs | |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
692 |
self task isAmendable ifTrue:[ |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
693 |
cs := self task temporaryWorkingCopy parent1 . |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
694 |
self amendLabel value: (resources string: 'Amend %1' with: (cs id printStringWithoutNumber , ' ' , cs summary) asText allBold) |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
695 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
696 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
697 |
"Created: / 25-08-2015 / 12:51:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
698 |
"Modified: / 07-02-2016 / 08:33:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
699 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
700 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
701 |
updateFileList |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
702 |
| wcroot statuses entries wcrootPathNameRelative wcrootPathNameRelativeLen notMerge | |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
703 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
704 |
"HACK..." |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
705 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
157
diff
changeset
|
706 |
wcroot := self task temporaryWorkingCopyRoot. |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
707 |
wcrootPathNameRelative := wcroot pathNameRelative. |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
708 |
wcrootPathNameRelativeLen := wcrootPathNameRelative size. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
709 |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
710 |
notMerge := self task isMergeCommit not. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
711 |
|
235
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
712 |
statuses := self task temporaryWorkingCopy repository execute: |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
713 |
(HGCommand status |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
714 |
workingDirectory: wcroot pathName; |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
715 |
yourself). |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
716 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
717 |
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
|
718 |
statuses do:[:statusAndPath| |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
719 |
(fileListShowOnlyModifiedHolder value not |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
720 |
or:[statusAndPath first isCleanOrIgnoredOrNotTracked not]) ifTrue:[ |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
721 |
| nm status entry | |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
722 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
723 |
(statusAndPath second startsWith: wcrootPathNameRelative) ifTrue:[ |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
724 |
status := statusAndPath first. |
67
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
725 |
nm := statusAndPath second. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
726 |
wcrootPathNameRelativeLen ~~ 0 ifTrue:[ |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
727 |
nm := nm copyFrom:wcrootPathNameRelativeLen + 2. |
985488894699
HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
728 |
]. |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
729 |
entry := SCMAbstractCommitDialog::FileEntry application: self entry: wcroot / nm name: nm. |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
730 |
entry includeEditable: notMerge. |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
731 |
entry icon: status icon. |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
732 |
entries add: entry |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
55
diff
changeset
|
733 |
]. |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
734 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
735 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
736 |
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
|
737 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
738 |
"Created: / 08-02-2012 / 18:05:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
739 |
"Modified: / 29-11-2013 / 15:14:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
740 |
! |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
741 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
742 |
updateMessage |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
743 |
| rev prevMsg | |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
744 |
rev := self task temporaryWorkingCopy parent1Id. |
563
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
745 |
prevMsg := (self task repository @ rev) message. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
746 |
self amendHolder value ifTrue:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
747 |
(self message includesSubstring: prevMsg) ifFalse:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
748 |
self message isEmpty ifTrue:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
749 |
self message: prevMsg |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
750 |
] ifFalse:[ |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
751 |
self message: self message , Character cr , '---' , Character cr , prevMsg. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
752 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
753 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
754 |
self doUpdateButtonEnablements |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
755 |
]. |
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
756 |
|
6104cd9f44f1
Issue #19: Initial support for amending a commit
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
509
diff
changeset
|
757 |
"Created: / 25-08-2015 / 11:58:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
758 |
"Modified: / 07-02-2016 / 09:00:54 / 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
|
759 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
760 |
|
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
761 |
!HGCommitDialog methodsFor:'help texts'! |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
762 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
763 |
flyByHelpTextForKey:key |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
764 |
key == #amendLabelHelp ifTrue:[ |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
765 |
| cs | |
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
766 |
self task isAmendable ifTrue:[ |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
767 |
cs := self task temporaryWorkingCopy parent1 . |
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
768 |
^ cs helpText |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
769 |
] |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
770 |
]. |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
771 |
^ super flyByHelpTextForKey:key |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
772 |
|
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
773 |
"Created: / 10-09-2015 / 18:49:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
774 |
"Modified: / 07-02-2016 / 09:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
573
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
775 |
! ! |
0a22fe210a7d
Display commit details in a tooltip
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
563
diff
changeset
|
776 |
|
809
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
777 |
!HGCommitDialog methodsFor:'hooks'! |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
778 |
|
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
779 |
postOpenWith: anUIBuilder |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
780 |
self task isPackageLogicalRevisonObsolete ifTrue:[ |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
781 |
| successors | |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
782 |
|
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
783 |
successors := self task changesetSuccessors. |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
784 |
self infoPanel |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
785 |
reset; |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
786 |
beWarning; |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
787 |
message:(resources string: 'The current revision is obsolete' ). |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
788 |
successors size == 1 ifTrue:[ |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
789 |
self infoPanel |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
790 |
addButtonWithLabel: (resources string:'Reconcile') |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
791 |
action: [ self doUpdateLogicalRevisionTo: successors anyOne id. self infoPanel hide. super postOpenWith: anUIBuilder] |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
792 |
]. |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
793 |
self infoPanel show. |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
794 |
^ self. |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
795 |
]. |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
796 |
super postOpenWith: anUIBuilder |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
797 |
|
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
798 |
"Created: / 09-02-2018 / 08:50:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
799 |
! ! |
1bbcf42198c6
Initial support for updating obsolete package revision to its successor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
687
diff
changeset
|
800 |
|
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
801 |
!HGCommitDialog methodsFor:'initialization'! |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
802 |
|
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
803 |
initialize |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
804 |
super initialize. |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
805 |
commitingNewHeadAcknowledged := false. |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
806 |
|
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
807 |
"Created: / 12-02-2018 / 19:09:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
808 |
! ! |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
809 |
|
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
810 |
!HGCommitDialog methodsFor:'private'! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
811 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
812 |
doCheckAuthor |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
813 |
"Checks whether commit author is defined" |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
814 |
|
375
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
815 |
| author | |
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
816 |
|
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
817 |
author := self task author. |
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
818 |
|
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
819 |
"/ Check for lazy users which only uncomment the line and |
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
820 |
"/ does not bother with filling in proper values. See |
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
821 |
"/ HGConfig userConfigFileTemplate |
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
822 |
(author isNil or:[author = 'FirstName LastName <Email>']) ifTrue:[ |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
823 |
self infoPanel |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
824 |
reset; |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
825 |
beWarning; |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
826 |
message: 'Commit author signature not configured'; |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
827 |
addButtonWithLabel: (self resources string:'Edit') |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
828 |
action: [self doEditUserConfig]; |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
829 |
addButtonWithLabel: (self resources string:'Cancel') |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
830 |
action: [self doCancel]. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
831 |
self acceptEnabled:false. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
832 |
^self. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
833 |
]. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
834 |
self doCheckHead. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
835 |
|
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
836 |
"Created: / 07-12-2012 / 15:56:36 / jv" |
375
6ecd3ade39be
More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
837 |
"Modified: / 18-02-2014 / 11:33:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
838 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
839 |
|
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
840 |
doCheckHead |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
841 |
"Checks whether commit would create a new head" |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
842 |
|
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
843 |
commitingNewHeadAcknowledged ifTrue:[ ^ self ]. |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
844 |
|
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
845 |
(self amendHolder value not and:[self task isCommitingNewHead]) ifTrue:[ |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
846 |
self infoPanel |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
847 |
reset; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
848 |
beInformation; |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
849 |
message: (self resources string:'Comitting a new head.'); |
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
850 |
addButtonWithLabel: (self resources string:'Proceed') action: [ commitingNewHeadAcknowledged := true. self infoPanel hide]; |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
851 |
"/addButtonWithLabel: (self resources string:'Cancel') action:[self doCancel]; |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
852 |
show. |
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
853 |
] ifFalse:[ |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
854 |
self infoPanel hide. |
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
855 |
]. |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
856 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
857 |
"Created: / 07-12-2012 / 15:52:18 / jv" |
813
dab0996374c8
Added support for amending a non-head revision
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
809
diff
changeset
|
858 |
"Modified: / 12-02-2018 / 19:10:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
859 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
860 |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
861 |
doRunSanityChecks |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
862 |
self task isPackageCommit ifFalse:[ |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
863 |
self updateFileList. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
864 |
self message: self task message. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
865 |
]. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
866 |
super doRunSanityChecks. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
867 |
|
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
868 |
"Created: / 01-04-2013 / 12:08:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
869 |
"Modified: / 01-04-2013 / 13:55:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
870 |
! |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
248
diff
changeset
|
871 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
872 |
doUpdateWorkingCopy |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
873 |
super doUpdateWorkingCopy. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
874 |
self doCheckAuthor. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
875 |
|
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
876 |
"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
|
877 |
"Modified: / 01-12-2012 / 00:49:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
143
diff
changeset
|
878 |
"Modified (format): / 07-12-2012 / 15:53:43 / jv" |
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
879 |
! ! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
880 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
881 |
!HGCommitDialog class methodsFor:'documentation'! |
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
882 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
883 |
version_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
884 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
885 |
^ '$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
|
886 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
46
diff
changeset
|
887 |
|
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
888 |
version_SVN |
602
007e9ad04dca
Fix in commit dialog: use current working copy parent as changeset to ammend
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
573
diff
changeset
|
889 |
^ 'Id:: ' |
46
d5a192b11a1a
- More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
890 |
! ! |
333 | 891 |