hg/stx-libscm: comparison mercurial/HGSourceCodeManagementSettingsAppl.st

equal deleted inserted replaced

-:b2123fd2888b
+:5c36325d6f60
 adjust: left
 )
 (FilenameInputFieldSpec
 name: 'HGCommand'
 layout: (LayoutFrame 125 0 0 0 -100 1 0 1)
+enableChannel: hgEnabled
 model: hgCommand
 acceptOnPointerLeave: true
 emptyFieldReplacementText: 'Autodetect'
 )
 (ActionButtonSpec
 label: 'Test'
 name: 'HGCommandTest'
 layout: (LayoutFrame -100 1 0 0 -8 1 0 1)
+visibilityChannel: false
 translateLabel: true
 model: doTestHGCommand
-enableChannel: svnEnabled
+)
+(ActionButtonSpec
+label: 'Browse'
+name: 'BrowseButton'
+layout: (LayoutFrame -100 1 0 0 -8 1 0 1)
+translateLabel: true
+model: doSelectHGCommand
+enableChannel: hgEnabled
 )
 )
 )
 extent: (Point 695 25)
 extent: (Point 695 15)
 )
 (CheckBoxSpec
 label: 'Automatically push changes to upstream repository'
 name: 'CheckBox2'
+enableChannel: hgEnabled
 model: hgAutopush
 translateLabel: true
 extent: (Point 695 22)
 )
 (ViewSpec
 foregroundColor: (Color 0.0 0.0 100.0)
 translateLabel: true
 labelChannel: hgrcAspect
 adjust: left
 model: doEditHGRC
+enableChannel: hgEnabled
 )
 (ActionButtonSpec
 label: 'Edit'
 name: 'Button1'
 layout: (LayoutFrame -106 1 -17 0.5 -6 1 8 0.5)
 translateLabel: true
 model: doEditHGRC
+enableChannel: hgEnabled
 )
 )
 )
 extent: (Point 695 92)
 )
 )
 )
 )
-"Modified: / 18-02-2014 / 11:14:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !HGSourceCodeManagementSettingsAppl class methodsFor:'queries'!
 managerClass
 doCheckSettings
 "Perform some sanity check on current configuration"
 self doCheckUsername ifFalse:[ ^ self ].
 self doCheckMenuLayout ifFalse:[ ^ self ].
+self doCheckCommand ifFalse:[ ^ self ].
 self infoPanel hide.
 "Created: / 18-02-2014 / 10:04:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 18-02-2014 / 11:57:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 10:32:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 doEditHGRC
 <resource: #uiCallback>
 editor loadFile: hgrc.
 editor syntaxHolder value: nil.
 ]
 "Modified: / 18-02-2014 / 10:43:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+doSelectHGCommand
+| guess executable |
+guess := OperatingSystem pathOfCommand: 'hg'.
+executable := Dialog requestFileName:(resources string:'Select hg command') default: guess ifFail:[ ^ self ].
+self hgCommand value: executable
+"Created: / 21-02-2014 / 10:13:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 doTestHGCommand
 self hgCommand value isEmptyOrNil ifTrue:[
 "Created: / 19-11-2012 / 21:32:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 21-01-2013 / 05:12:39 / jv"
 ! !
 !HGSourceCodeManagementSettingsAppl methodsFor:'actions-checks'!
+doCheckCommand
+"Check `hg` command. Return true if `hg` command exists
+and of supported version, false otherwise."
+| executable |
+executable := self hgCommand value.
+executable isEmptyOrNil ifTrue:[
+executable := OperatingSystem pathOfCommand:'hg'.
+executable isNil ifTrue:[
+self infoPanel
+reset;
+beWarning;
+message: (resources string:'Cannot find path to `hg` command');
+addButtonWithLabel: (self resources string:'Browse') action: [self infoPanel hide. self doSelectHGCommand ];
+show.
+^ false
+].
+].
+[
+HGCommand hgCommandValidate: executable
+] on: HGInvalidVersionError do:[:ex |
+self infoPanel
+reset;
+beWarning;
+message: (resources string:'Unssuported Mercurial version %1' with: (ex parameter asStringWith: $.));
+addButtonWithLabel: (self resources string:'Browse') action: [self infoPanel hide. self doSelectHGCommand ];
+show.
+^ false
+] on: HGCommandError do:[:ex |
+self infoPanel
+reset;
+beWarning;
+message: (resources string:ex description);
+addButtonWithLabel: (self resources string:'Browse') action: [self infoPanel hide. self doSelectHGCommand ];
+show.
+^ false
+].
+^ true.
+"Created: / 21-02-2014 / 09:58:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 doCheckMenuLayout
 "Check if browser SCM menu layouyt is not #old. Return true, if yes,
 false otherwise. As a sideffect, show message in info panel"
 addButtonWithLabel: (self resources string:'Use ''Compact''') action: [
 UserPreferences current sourceCodeManagementMenuLayout: #compact.
 (Dialog confirm: (resources string: 'Settings changed to ''Compact''\\Save settings?') withCRs) ifTrue:[
 SettingsDialog saveSettingsWithoutAskingForFile
 ].
-self infoPanel hide.
+self doCheckCommand
 ];
 addButtonWithLabel: (self resources string:'Use ''Inline''') action: [
 UserPreferences current sourceCodeManagementMenuLayout: #inline.
 (Dialog confirm: (resources string: 'Settings changed to ''Compact''\\Save settings?') withCRs) ifTrue:[
 SettingsDialog saveSettingsWithoutAskingForFile
 ].
-self infoPanel hide.
+self doCheckCommand
 ];
 addButtonWithLabel: (resources string:'Ignore') action: [IgnoreCheckUsername := true.  self infoPanel hide.];
 show.
 ^ false
 ].
 ^ true.
 "Created: / 18-02-2014 / 11:46:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 10:32:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 doCheckUsername
 "Check if username is configured. Return true, if yes,
 false otherwise. As a sideffect, show message in info panel"
 !
 hgCommand
 hgCommand isNil ifTrue:[
-hgCommand := self settingsAspectFor: #hgCommand
+hgCommand := self settingsAspectFor: #hgCommand.
+hgCommand onChangeSend: #doCheckCommand to: self.
 ].
 ^ hgCommand
-"Modified: / 19-11-2012 / 21:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 10:33:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 hgDiff2Command
 hgDiff2Command isNil ifTrue:[
 shownInBrowserMenusHolder onChangeSend:#doCheckSettings to:self.
 ].
 ^ shownInBrowserMenusHolder.
 "Created: / 18-02-2014 / 10:05:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!HGSourceCodeManagementSettingsAppl methodsFor:'aspects-queries'!
+hgEnabled
+^ self shownInBrowserMenusHolder
+"Created: / 21-02-2014 / 10:37:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !HGSourceCodeManagementSettingsAppl methodsFor:'helpers'!
 settingsAspectFor: settingName

changeset 378	5c36325d6f60
parent 375	6ecd3ade39be
child 444	8987b87a562a