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

equal deleted inserted replaced

-:5acd6d915c77
+:fc0607653d8a
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:HGCommand
 !
+HGCommand subclass:#init
+	instanceVariableNames:'path'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:HGCommand
+!
 HGCommand subclass:#locate
 	instanceVariableNames:'revision'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:HGCommand
 ! !
 !HGCommand class methodsFor:'accessing'!
 hgCommand
-| h |
+"Returns absolute path to hg executable to use"
-HGExecutable notNil ifTrue:[
-^ HGExecutable
-].
-HGExecutable := UserPreferences current hgCommand.
 HGExecutable isNil ifTrue:[
-OperatingSystem isMSWINDOWSlike ifTrue:[
+| executable |
-"/        h := Win32OperatingSystem registryEntry
+executable :=  UserPreferences current hgCommand.
-"/                key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'.
+executable isNil ifTrue:[
-"/        h notNil ifTrue:[HGExecutable := h valueNamed:''].
+OperatingSystem isMSWINDOWSlike ifTrue:[
-"/        HGExecutable notEmptyOrNil ifTrue:[^HGExecutable]
+"/        | h |
-HGExecutable := OperatingSystem pathOfCommand:'hg'.
+"/
-] ifFalse:[
+"/        h := Win32OperatingSystem registryEntry
-OperatingSystem isUNIXlike ifTrue:[
+"/                key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'.
-HGExecutable := OperatingSystem pathOfCommand:'hg'.
+"/        h notNil ifTrue:[HGExecutable := h valueNamed:''].
-]
+"/        HGExecutable notEmptyOrNil ifTrue:[^HGExecutable]
+executable := OperatingSystem pathOfCommand:'hg'.
+] ifFalse:[
+OperatingSystem isUNIXlike ifTrue:[
+executable := OperatingSystem pathOfCommand:'hg'.
+]
+].
 ].
-].
+executable := self hgCommandValidate: executable.
-HGExecutable isNil ifTrue:[
+HGExecutable := executable.
-self error:'''hg'' executable not found!!'.
 ].
 ^ HGExecutable
 "
 HGExecutable := nil.
-self basicNew executable"
+self basicNew executable
+"
 "Created: / 19-11-2012 / 21:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 19-11-2012 / 23:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 08:54:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 hgCommand: command
 HGExecutable := command
 HGCommand hgCommand: '/usr/bin/hg'
 "
 "Created: / 19-11-2012 / 21:49:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified (comment): / 03-03-2013 / 12:24:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+hgCommandValidate: executable
+"/ Given a `executable`, checks whether it is a valid hg binary.
+"/ Returns absolute path to hg binary or raise an
+"/ HGInvalidExecutableError or HGInvalidVersionError
+"/ if `executable` is not valid hg binary.
+"/
+| path version |
+path := executable asFilename.
+path isAbsolute ifFalse:[
+path := path asAbsoluteFilename.
+path exists ifFalse:[
+"/ Also try to find specified command along PATH, maybe somebody
+"/ just typed 'hg' in...
+(executable includes: Filename separator) ifFalse:[
+path  := (OperatingSystem pathOfCommand: executable).
+path isNil ifTrue:[
+HGInvalidExecutableError raiseErrorString:('''hg'' executable (%1) not found!!' bindWith: executable).
+^ nil
+].
+^ path
+].
+].
+].
+path exists ifFalse:[
+HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) does not exists!!' bindWith: path pathName).
+^ nil
+].
+path isDirectory ifTrue:[
+HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is actually a directory!!' bindWith: path pathName).
+^ nil
+].
+path isExecutable ifFalse:[
+HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is cannot be executed!!' bindWith: path pathName).
+^ nil
+].
+[
+version := self hgVersionOf: path pathName.
+] on: Error do:[:ex |
+HGInvalidExecutableError newException
+parameter: ex;
+messageText: 'Failed to check version: ', ex description;
+raise.
+^ nil
+].
+(self hgVersionIsSupported: version) ifFalse:[
+HGInvalidVersionError newException
+parameter: version;
+messageText: ('Unsuported Mercurial version (%1)' bindWith: (version asStringWith:$.));
+raise.
+^ nil
+].
+^ path pathName
+"Created: / 21-02-2014 / 08:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 10:31:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 hgVersion
 "Return mercurial version installed on this compiter"
 ^heads new
 "Created: / 27-11-2012 / 21:32:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+init
+^init new
+"Created: / 13-02-2014 / 12:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 locate
 ^locate new
 "Created: / 16-11-2012 / 22:36:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 url: url;
 path: stringOfFilename asFilename asAbsoluteFilename pathName;
 execute
 "Created: / 01-10-2012 / 00:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+init: aStringOrFilename
+^ self init path: aStringOrFilename; yourself
+"Created: / 13-02-2014 / 12:37:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !HGCommand methodsFor:'accessing'!
 result
 self assert: anException isException.
 Trace ifTrue:[
 Logger log: 'cmd: propagating: ' , anException class name , ' - ', anException description severity: #trace facility: 'HG'.
 ].
+Debug ifTrue:[
+anException isNotification ifFalse:[
+thisContext fullPrintAllOn: Transcript.
+].
+].
 errors nextPut: anException.
 "Created: / 04-02-2013 / 21:29:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 09-02-2014 / 19:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 05-03-2014 / 00:08:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 signal
 "Signal all propagated exceptions to the caller"
 "Created: / 15-11-2012 / 17:04:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 08-03-2013 / 19:35:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+!HGCommand::init methodsFor:'accessing'!
+path
+^ path
+!
+path:aStringOrFilename
+path := aStringOrFilename.
+! !
+!HGCommand::init methodsFor:'private'!
+argumentsCommandOn:stream
+stream nextPut: path asFilename asAbsoluteFilename pathName
+"Created: / 13-02-2014 / 12:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+parseOutput:stream
+"Parses output of 'hg' command, i.e. commit, log, update, checkout,
+etc."
+^ nil
+"Created: / 13-02-2014 / 12:36:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
 !HGCommand::locate methodsFor:'accessing'!
 revision
 ^ revision
 !
 !HGCommand::version methodsFor:'private'!
 arguments
-^ Array with: HGExecutable with: '--version'
+^ Array with: self executable with: '--version'
 "Created: / 19-11-2012 / 20:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-02-2014 / 00:20:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 parseOutput:stream
 "Parses output of 'hg' command, i.e. commit, log, update, checkout,
 etc."

changeset 395	fc0607653d8a
parent 372	5acd6d915c77
parent 391	f05648d15add
child 399	abafe12d47d6