mercurial/HGCommitDialog.st
author Claus Gittinger <cg@exept.de>
Wed, 29 Aug 2018 12:46:21 +0200
branchcvs_MAIN
changeset 856 4d897e8ab998
parent 848 15c3d3cc8032
permissions -rw-r--r--
#REFACTORING by cg class: HGRevisionAnnotation removed: #annotatesClass: #annotatesMethod:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
848
15c3d3cc8032 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 671
diff changeset
     1
"{ Encoding: utf8 }"
15c3d3cc8032 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 671
diff changeset
     2
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
     3
"
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
     4
stx:libscm - a new source code management library for Smalltalk/X
509
f92210d4585b Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 406
diff changeset
     5
Copyright (C) 2012-2015 Jan Vrany
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
     6
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
     7
This library is free software; you can redistribute it and/or
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
     8
modify it under the terms of the GNU Lesser General Public
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
     9
License as published by the Free Software Foundation; either
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    10
version 2.1 of the License. 
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    11
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    12
This library is distributed in the hope that it will be useful,
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    13
but WITHOUT ANY WARRANTY; without even the implied warranty of
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    14
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    15
Lesser General Public License for more details.
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    16
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    17
You should have received a copy of the GNU Lesser General Public
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    18
License along with this library; if not, write to the Free Software
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    19
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    20
"
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    21
"{ Package: 'stx:libscm/mercurial' }"
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    22
636
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
    23
"{ NameSpace: Smalltalk }"
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
    24
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    25
SCMAbstractCommitDialog subclass:#HGCommitDialog
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
    26
	instanceVariableNames:'remoteHolder remoteListHolder remotePushHolder branchCreateHolder
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
    27
		branchHolder moreOptionsHolder'
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    28
	classVariableNames:''
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    29
	poolDictionaries:''
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    30
	category:'SCM-Mercurial-StX-Interface'
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    31
!
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    32
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    33
!HGCommitDialog class methodsFor:'documentation'!
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    34
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    35
copyright
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    36
"
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    37
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
    38
Copyright (C) 2012-2015 Jan Vrany
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    39
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    40
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
    41
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
    42
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
    43
version 2.1 of the License. 
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    44
335
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    45
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
    46
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
    47
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
    48
Lesser General Public License for more details.
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    49
7e19ab19148b Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 333
diff changeset
    50
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
    51
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
    52
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
210
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    53
"
54a73fa50d40 Added copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 185
diff changeset
    54
! !
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    55
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    56
!HGCommitDialog class methodsFor:'image specs'!
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    57
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    58
dialogIcon
848
15c3d3cc8032 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 671
diff changeset
    59
    <resource: #programImage>
15c3d3cc8032 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 671
diff changeset
    60
67
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
    61
    ^ HGIconLibrary hgLogo2
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    62
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    63
    "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
    64
    "Modified: / 16-11-2012 / 11:01:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
848
15c3d3cc8032 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 671
diff changeset
    65
    "Modified: / 28-07-2018 / 09:56:29 / Claus Gittinger"
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    66
! !
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
    67
55
30d72a8f4501 Commit support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 54
diff changeset
    68
!HGCommitDialog class methodsFor:'interface specs'!
30d72a8f4501 Commit support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 54
diff changeset
    69
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    70
contentSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    71
    "This resource specification was automatically generated
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    72
     by the UIPainter of ST/X."
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    73
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    74
    "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
    75
     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
    76
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    77
    "
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    78
     UIPainter new openOnClass:HGCommitDialog andSelector:#contentSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    79
     HGCommitDialog new openInterface:#contentSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    80
    "
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    81
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    82
    <resource: #canvas>
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    83
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    84
    ^ 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    85
     #(FullSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    86
        name: contentSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    87
        window: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    88
       (WindowSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    89
          label: 'Commit...'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    90
          name: 'Commit...'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    91
          min: (Point 10 10)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    92
          bounds: (Rectangle 0 0 698 603)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    93
        )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    94
        component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    95
       (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    96
          collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    97
           (VariableVerticalPanelSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    98
              name: 'VariablePanel'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
    99
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   100
              component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   101
             (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   102
                collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   103
                 (VerticalPanelViewSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   104
                    name: 'VerticalPanel1'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   105
                    horizontalLayout: fit
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   106
                    verticalLayout: bottomSpaceFit
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   107
                    horizontalSpace: 3
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   108
                    verticalSpace: 3
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   109
                    elementsChangeSize: true
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   110
                    component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   111
                   (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   112
                      collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   113
                       (ViewSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   114
                          name: 'MessageAndInfoPane'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   115
                          component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   116
                         (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   117
                            collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   118
                             (SubCanvasSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   119
                                name: 'InfoPanel'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   120
                                layout: (LayoutFrame 0 0 0 0 0 1 40 0)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   121
                                level: 0
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   122
                                initiallyInvisible: true
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   123
                                hasHorizontalScrollBar: false
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   124
                                hasVerticalScrollBar: false
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   125
                                clientKey: infoPanel
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   126
                                createNewBuilder: false
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   127
                              )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   128
                             (ViewSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   129
                                name: 'MessagePane'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   130
                                layout: (LayoutFrame 0 0 0 0 0 1 0 1)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   131
                                component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   132
                               (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   133
                                  collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   134
                                   (LabelSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   135
                                      label: 'Commit message:'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   136
                                      name: 'MessageLabel'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   137
                                      layout: (LayoutFrame 0 0 0 0 0 1 25 0)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   138
                                      translateLabel: true
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   139
                                      adjust: left
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   140
                                    )
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   141
                                   (LinkButtonSpec
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   142
                                      label: 'More Options'
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   143
                                      name: 'MoreOptions'
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   144
                                      layout: (LayoutFrame -100 1 0 0 0 1 30 0)
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   145
                                      visibilityChannel: moreOptionsHiddenHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   146
                                      translateLabel: true
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   147
                                      labelChannel: moreOptionsLabel
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   148
                                      adjust: right
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   149
                                      model: doShowMoreOptions
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   150
                                    )
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   151
                                   (TextEditorSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   152
                                      name: 'Message'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   153
                                      layout: (LayoutFrame 0 0 30 0 0 1 0 1)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   154
                                      enableChannel: enabledHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   155
                                      hasHorizontalScrollBar: true
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   156
                                      hasVerticalScrollBar: true
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   157
                                      modifiedChannel: messageModifiedHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   158
                                      hasKeyboardFocusInitially: false
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   159
                                      postBuildCallback: messageView:
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   160
                                    )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   161
                                   )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   162
                                 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   163
                                )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   164
                              )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   165
                             )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   166
                           
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   167
                          )
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   168
                          extent: (Point 698 239)
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   169
                        )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   170
                       (ViewSpec
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   171
                          name: 'BranchBox'
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   172
                          visibilityChannel: moreOptionsVisibleHolder
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   173
                          component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   174
                         (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   175
                            collection: (
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   176
                             (InputFieldSpec
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   177
                                name: 'EntryField1'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   178
                                layout: (LayoutFrame 215 0 0 0 0 1 0 1)
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   179
                                visibilityChannel: branchCreateHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   180
                                model: branchHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   181
                                emptyFieldReplacementText: 'Branch name'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   182
                              )
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   183
                             (CheckBoxSpec
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   184
                                label: 'Commit into new branch'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   185
                                name: 'BranchCheckBox'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   186
                                layout: (LayoutFrame 0 0 2 0 215 0 25 0)
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   187
                                model: branchCreateHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   188
                                translateLabel: true
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   189
                              )
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   190
                             )
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   191
                           
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   192
                          )
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   193
                          extent: (Point 698 25)
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   194
                        )
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   195
                       (ViewSpec
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   196
                          name: 'PushBox'
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   197
                          visibilityChannel: moreOptionsVisibleHolder
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   198
                          component: 
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   199
                         (SpecCollection
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   200
                            collection: (
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   201
                             (CheckBoxSpec
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   202
                                label: 'Push to upstream repository'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   203
                                name: 'CheckBox1'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   204
                                layout: (LayoutFrame 0 0 2 0 215 0 25 0)
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   205
                                model: remotePushHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   206
                                translateLabel: true
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   207
                              )
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   208
                             (ComboListSpec
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   209
                                name: 'ComboList2'
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   210
                                layout: (LayoutFrame 215 0 0 0 0 1 0 1)
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   211
                                visibilityChannel: remotePushHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   212
                                model: remoteHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   213
                                comboList: remoteListHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   214
                              )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   215
                             )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   216
                           
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   217
                          )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   218
                          extent: (Point 698 25)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   219
                        )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   220
                       )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   221
                     
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   222
                    )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   223
                  )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   224
                 (ViewSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   225
                    name: 'FilePane'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   226
                    component: 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   227
                   (SpecCollection
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   228
                      collection: (
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   229
                       (UISubSpecification
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   230
                          name: 'FilePaneSpec'
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   231
                          layout: (LayoutFrame 0 0 0 0 0 1 0 1)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   232
                          minorKey: filePaneSpec
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   233
                        )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   234
                       )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   235
                     
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   236
                    )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   237
                  )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   238
                 )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   239
               
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   240
              )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   241
              handles: (Any 0.5 1.0)
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   242
            )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   243
           )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   244
         
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   245
        )
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   246
      )
55
30d72a8f4501 Commit support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 54
diff changeset
   247
! !
30d72a8f4501 Commit support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 54
diff changeset
   248
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
   249
!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
   250
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   251
doAccept
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   252
    self remotePushHolder value 
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   253
        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
   254
        ifFalse:[self task remote: nil].
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   255
    self branchCreateHolder value 
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   256
        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
   257
        ifFalse:[self task branch: nil].
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   258
    [
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   259
        super doAccept.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   260
    ] on: HGPushWouldCreateNewHeadError do:[:ex|
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   261
        self infoPanel 
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   262
                reset;
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   263
                beWarning;
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   264
                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
   265
                addButtonOK;
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   266
                show.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   267
    ]
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   268
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   269
    "Created: / 10-12-2012 / 01:46:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   270
    "Modified: / 10-12-2012 / 02:56:43 / 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
   271
!
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   272
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   273
doEditUserConfig
375
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   274
    HGSourceCodeManagementSettingsAppl new doEditHGRC.
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   275
    self doCancel.
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   276
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   277
    "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
   278
    "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
   279
!
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   280
143
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   281
doShowDiffsForEntry
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   282
    | selection |
143
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   283
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   284
    selection := self fileSelectionHolder value.
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   285
    selection isNil ifTrue:[ ^ self ].        
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   286
    selection isCollection ifTrue:[
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   287
        selection do:[:each|
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   288
            self doShowDiffsForEntry: each entry against: each entry changeset  
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   289
        ]
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   290
    ] ifFalse:[
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   291
        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
   292
    ].
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   293
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   294
    "Created: / 09-02-2012 / 14:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   295
    "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
   296
!
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   297
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
   298
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
   299
    |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
   300
185
b566a1c31bc8 Bugfix: HGCommitDialog>>#doShowDiffsForEntry:against: use #temporaryWorkingCopy.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 173
diff changeset
   301
    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
   302
    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
   303
    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
   304
        [ 
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   305
            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
   306
        ] 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
   307
            "/ 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
   308
        ].
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
   309
    ].
406
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   310
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
   311
    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
   312
        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
   313
            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
   314
        ] ifFalse:[ 
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   315
            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
   316
        ].
311
e8f38dd4af64 Fix for Smalltalk/X 6.2.2 in HGCommitDialog>>#doShowDiffsForEntry:against:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 282
diff changeset
   317
        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
   318
        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
   319
            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
   320
        ] ifFalse:[ 
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   321
            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
   322
        ].
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   323
        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
   324
        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
   325
        (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
   326
            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
   327
            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
   328
            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
   329
            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
   330
            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
   331
    ] 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
   332
        | 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
   333
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   334
        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
   335
            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
   336
        ] ifFalse:[ 
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   337
            text1 := ''.
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   338
        ].
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   339
        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
   340
            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
   341
        ] ifFalse:[ 
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   342
            text2 := ''.
f52fedd27727 Fix for issue #14 - DNU in commit dialog after "show differences"
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 389
diff changeset
   343
        ].
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
   344
        "/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
   345
        (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
   346
            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
   347
            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
   348
            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
   349
            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
   350
            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
   351
    ]
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
   352
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
   353
    "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
   354
    "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
   355
!
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   356
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   357
doShowDiffsForEntryAgainstHEAD
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   358
    | selection |
143
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   359
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   360
    selection := self fileSelectionHolder value.
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   361
    selection isNil ifTrue:[ ^ self ].        
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   362
    selection isCollection ifTrue:[
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   363
        selection do:[:each|
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   364
            self doShowDiffsForEntry: each entry against: self workingCopy heads anElement 
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   365
        ]
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   366
    ] ifFalse:[
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   367
        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
   368
    ].
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   369
70e4bf961dec Added lost methods to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 142
diff changeset
   370
    "Created: / 10-02-2012 / 10:00:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   371
    "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
   372
!
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   373
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   374
doShowMoreOptions
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   375
    self moreOptionsHolder value: true
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   376
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   377
    "Created: / 10-12-2012 / 11:39:48 / 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
   378
! !
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
   379
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   380
!HGCommitDialog methodsFor:'aspects'!
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   381
152
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   382
branchCreateHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   383
    <resource: #uiAspect>
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   384
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   385
    branchCreateHolder isNil ifTrue:[
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   386
        branchCreateHolder := false asValue.
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   387
    ].
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   388
    ^ branchCreateHolder.
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   389
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   390
    "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
   391
!
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   392
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   393
branchHolder
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   394
    <resource: #uiAspect>
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   395
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   396
    branchHolder isNil ifTrue:[
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   397
        branchHolder := ValueHolder new.
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   398
    ].
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   399
    ^ branchHolder.
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   400
!
9068fe7a5795 Support for commiting to a new branch.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 151
diff changeset
   401
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   402
moreOptionsHiddenHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   403
    ^BlockValue forLogicalNot: self moreOptionsVisibleHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   404
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   405
    "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
   406
!
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   407
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   408
moreOptionsHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   409
    "return/create the 'moreOptionsHolder' value holder (automatically generated)"
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   410
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   411
    moreOptionsHolder isNil ifTrue:[
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   412
        moreOptionsHolder := false asValue
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   413
    ].
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   414
    ^ moreOptionsHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   415
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   416
    "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
   417
!
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   418
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   419
moreOptionsLabel
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   420
671
15adc51b123c #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 666
diff changeset
   421
    ^ (resources string: 'More Options') 
15adc51b123c #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 666
diff changeset
   422
        asActionLinkTo:[ self doShowMoreOptions ]
157
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   423
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   424
    "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
   425
!
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   426
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   427
moreOptionsVisibleHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   428
    ^self moreOptionsHolder
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   429
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   430
    "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
   431
!
fb7a41a9cf92 HGCommitDialog UI improvements.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 152
diff changeset
   432
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   433
remoteHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   434
    <resource: #uiAspect>
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   435
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   436
    remoteHolder isNil ifTrue:[
173
c72794df7ae3 Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 157
diff changeset
   437
        | remote |
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   438
381
3dde2b867931 SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 375
diff changeset
   439
        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
   440
        remoteHolder := remote asValue.
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   441
    ].
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   442
    ^ remoteHolder.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   443
381
3dde2b867931 SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 375
diff changeset
   444
    "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
   445
!
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   446
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   447
remoteListHolder
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   448
    <resource: #uiAspect>
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   449
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   450
    remoteListHolder isNil ifTrue:[
173
c72794df7ae3 Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 157
diff changeset
   451
        | remoteList |
c72794df7ae3 Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 157
diff changeset
   452
381
3dde2b867931 SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 375
diff changeset
   453
        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
   454
        remoteListHolder := remoteList asValue
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   455
    ].
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   456
    ^ remoteListHolder.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   457
381
3dde2b867931 SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 375
diff changeset
   458
    "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
   459
!
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   460
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   461
remotePushHolder
636
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   462
    "automatically generated by UIPainter ..."
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   463
151
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   464
    <resource: #uiAspect>
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   465
    
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   466
    remotePushHolder isNil ifTrue:[
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   467
        remotePushHolder := UserPreferences current hgAutopush asValue.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   468
    ].
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   469
    ^ remotePushHolder.
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   470
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   471
    "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
   472
! !
527a1e85aef8 Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 146
diff changeset
   473
54
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   474
!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
   475
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   476
updateFileList
282
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   477
    | 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
   478
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   479
    "HACK..."
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   480
173
c72794df7ae3 Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 157
diff changeset
   481
    wcroot := self task temporaryWorkingCopyRoot.
57
47b14a8b7eb8 Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 55
diff changeset
   482
    wcrootPathNameRelative := wcroot pathNameRelative.
67
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   483
    wcrootPathNameRelativeLen := wcrootPathNameRelative size.
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   484
282
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   485
    notMerge := self task isMergeCommit not.
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   486
235
3d8ef499d7d9 Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 210
diff changeset
   487
    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
   488
                    (HGCommand status
3d8ef499d7d9 Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 210
diff changeset
   489
                        workingDirectory: wcroot pathName;
3d8ef499d7d9 Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 210
diff changeset
   490
                        yourself).
3d8ef499d7d9 Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 210
diff changeset
   491
54
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   492
    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
   493
    statuses do:[:statusAndPath|
67
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   494
        (fileListShowOnlyModifiedHolder value not
282
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   495
            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
   496
            | 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
   497
57
47b14a8b7eb8 Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 55
diff changeset
   498
            (statusAndPath second startsWith: wcrootPathNameRelative) ifTrue:[
359
b6516e783b2d Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 335
diff changeset
   499
                status := statusAndPath first.
67
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   500
                nm := statusAndPath second.
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   501
                wcrootPathNameRelativeLen ~~ 0 ifTrue:[
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   502
                    nm := nm copyFrom:wcrootPathNameRelativeLen + 2.
985488894699 HGCommitDialog: nicer icons, fix for file list
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 57
diff changeset
   503
                ].
57
47b14a8b7eb8 Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 55
diff changeset
   504
                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
   505
                entry includeEditable: notMerge.
359
b6516e783b2d Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 335
diff changeset
   506
                entry icon: status icon.
57
47b14a8b7eb8 Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 55
diff changeset
   507
                entries add: entry
47b14a8b7eb8 Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 55
diff changeset
   508
            ].
54
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   509
        ].
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   510
    ].
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   511
    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
   512
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   513
    "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
   514
    "Modified: / 29-11-2013 / 15:14:35 / 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
   515
! !
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   516
109
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   517
!HGCommitDialog methodsFor:'private'!
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   518
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   519
doCheckAuthor
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   520
    "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
   521
375
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   522
    | author |
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   523
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   524
    author := self task author.
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   525
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   526
    "/ 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
   527
    "/ 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
   528
    "/ HGConfig userConfigFileTemplate
6ecd3ade39be More sanity check in HG settings dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 359
diff changeset
   529
    (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
   530
        self infoPanel 
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   531
            reset;
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   532
            beWarning;
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   533
            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
   534
            addButtonWithLabel: (self resources string:'Edit')
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   535
                action: [self doEditUserConfig];
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   536
            addButtonWithLabel: (self resources string:'Cancel')
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   537
                action: [self doCancel].
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   538
        self acceptEnabled:false. 
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   539
        ^self.
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   540
    ].
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   541
    self doCheckHead.
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   542
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   543
    "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
   544
    "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
   545
!
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   546
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   547
doCheckHead
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   548
    "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
   549
389
1e2e6ce45878 Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 381
diff changeset
   550
    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
   551
        self infoPanel 
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   552
            reset;
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   553
            beInformation;
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   554
            message: (self resources string:'Comitting a new head.');
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   555
            addButtonWithLabel: (self resources string:'Proceed') action: [self infoPanel hide];
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   556
            "/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
   557
            show.
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   558
    ]
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   559
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   560
    "Created: / 07-12-2012 / 15:52:18 / jv"
248
b1a6ab0c86a1 Fixes in commit dialog (warning about commiting new head)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 235
diff changeset
   561
    "Modified: / 08-03-2013 / 20:13:35 / 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
   562
!
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   563
282
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   564
doRunSanityChecks
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   565
    self task isPackageCommit ifFalse:[
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   566
        self updateFileList.
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   567
        self message: self task message.
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   568
    ].
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   569
    super doRunSanityChecks.
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   570
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   571
    "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
   572
    "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
   573
!
fb71143ed353 Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 248
diff changeset
   574
146
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   575
doUpdateWorkingCopy
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   576
    super doUpdateWorkingCopy.
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   577
    self doCheckAuthor.
1015b8f6dc1c Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 143
diff changeset
   578
109
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   579
    "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
   580
    "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
   581
    "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
   582
! !
08c6eca6df25 Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 67
diff changeset
   583
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
   584
!HGCommitDialog class methodsFor:'documentation'!
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
   585
636
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   586
version
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   587
    ^ '$Header$'
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   588
!
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   589
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   590
version_CVS
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   591
    ^ '$Header$'
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   592
!
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   593
54
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   594
version_HG
115
b1ed2d29054b version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 109
diff changeset
   595
b1ed2d29054b version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 109
diff changeset
   596
    ^ '$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
   597
!
66045198bfbc More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents: 46
diff changeset
   598
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
   599
version_SVN
636
c31820f9c8d6 class: RBAbstractClass
Claus Gittinger <cg@exept.de>
parents: 509
diff changeset
   600
    ^ '$Id$'
46
d5a192b11a1a - More Smalltalk/X support
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff changeset
   601
! !
333
7ec547d30e86 Fix in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 311
diff changeset
   602