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