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

equal deleted inserted replaced

-:28497a4df430
+:2f7fa37437e9
 Copyright (C) 2012-2013 Jan Vrany
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License.
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 Copyright (C) 2012-2013 Jan Vrany
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License.
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 "Returns absolute path to hg executable to use"
 HGExecutable isNil ifTrue:[
 | executable |
 executable :=  UserPreferences current hgCommand.
 executable isNil ifTrue:[
 OperatingSystem isMSWINDOWSlike ifTrue:[
 "/        | h |
 "/
 "/        h := Win32OperatingSystem registryEntry
 "/                key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'.
 "/        h notNil ifTrue:[HGExecutable := h valueNamed:''].
 "/        HGExecutable notEmptyOrNil ifTrue:[^HGExecutable]
 executable := OperatingSystem pathOfCommand:'hg'.
 OperatingSystem isUNIXlike ifTrue:[
 executable := OperatingSystem pathOfCommand:'hg'.
 ]
 ].
 ].
 executable := self hgCommandValidate: executable.
 HGExecutable := executable.
 ].
 ^ HGExecutable
 "
 HGExecutable := nil.
 !
 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:[
 ].
 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
 self assert: anException isException.
 Trace ifTrue:[
 Logger log: 'cmd: propagating: ' , anException class name , ' - ', anException description severity: #trace facility: 'HG'.
 ].
 Debug ifTrue:[
-anException isNotification ifFalse:[
+	anException isNotification ifFalse:[
-thisContext fullPrintAllOn: Transcript.
+anException suspendedContext notNil ifTrue:[
+anException suspendedContext fullPrintAllOn: Transcript.
+].
 ].
 ].
 errors nextPut: anException.
 "Created: / 04-02-2013 / 21:29:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 environment := OperatingSystem isUNIXlike
 ifTrue:[OperatingSystem getEnvironment copy]
 ifFalse:[environment := Dictionary new].
 environment at: 'HGEDITOR' put: 'true'.
 environment at:'LANG' put:'C'.
+environment at:'LC_MESSAGES' put:'C'.
 args := self arguments.
 OperatingSystem isMSWINDOWSlike ifTrue:[
 args := String streamContents:[:s|
 args
 OperatingSystem isUNIXlike ifTrue:[
 "/JV: Q: Why this is necessary?
 stdout readWaitWithTimeoutMs: 10.
 stderr readWaitWithTimeoutMs: 10.
 Debug ifTrue:[
+"/ Transcript showCR:'hg stdout:'; showCR:stdout contents asString.
+"/ Transcript showCR:'hg stderr:'; showCR:stderr contents asString.
 stdout := stdout contents asString readStream.
 stderr := stderr contents asString readStream.
 ]
 ].
 spawn:block name: name
 "Spawn a new background thread executing given block"
 | worker |
 worker := [
 Trace ifTrue:[
 Logger log: 'cmd: worker ''', name , ''' spawned' severity: #trace facility: 'HG'.
 ].
 block on: Error do:[:ex|self propagate:ex]
 ] newProcess.
 worker addExitAction:[
 Trace ifTrue:[
 Logger log: 'cmd: worker ''', name , ''' finished' severity: #trace facility: 'HG'.
 ].
 "Created: / 03-03-2013 / 16:59:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-03-2013 / 11:42:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 spawnOutputReaderOn: stdout
 outputReader isNil ifTrue:[
 outputReader := self spawn: [ result := self parseOutput: stdout ] name: 'Output reader'.
 ]
 "Created: / 03-03-2013 / 17:00:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 !HGCommand::bookmark methodsFor:'private'!
 argumentsCommandOn:stream
 revision notNil ifTrue:[
 stream
 nextPut: '-r';
 nextPut: revision asString.
 ].
 stream
 nextPut: name.
 "Created: / 20-03-2014 / 17:26:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 20-03-2014 / 18:43:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 parseError:stream
 ^ (self parserOn: stream) parseErrorBookmark
 "Created: / 20-03-2014 / 17:27:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 "
 "Created: / 21-03-2014 / 01:21:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 parseError:stream
 ^ (self parserOn: stream) parseErrorBookmark
 "Created: / 20-03-2014 / 17:27:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 stream nextPut:'--debug' "/to get full node ids
 "Created: / 27-11-2012 / 19:54:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 parseError:stream
 ^ (self parserOn: stream) parseErrorBranches.
 "Created: / 06-02-2013 / 19:20:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 argumentsCommandOn:stream
 "Called to get command specific options"
 | template |
 template := HGCommandParser templateLog.
 path isNil ifTrue:[
 revsets isEmptyOrNil ifTrue:[
 self error:'No revisions given'.
 ].
 revsets do:[:revset|
 stream nextPut:string
 ].
 ] ifFalse:[
 stream nextPut: '--follow'.
 ].
 idsOnly == true ifTrue:[
 template := HGCommandParser templateLogIdsOnly.
 ].
 childrenOnly == true ifTrue:[
 template := HGCommandParser templateLogChildren.
 ].
 stream
 nextPut:'--debug';
 nextPut:'--template';
 nextPut:template.
 limit notNil ifTrue:[
 stream
 nextPut: '-l';
 nextPut: limit printString
 ].
 path notNil ifTrue:[
 "Created: / 19-11-2012 / 20:02:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !HGCommand class methodsFor:'documentation'!
+version
+^ '$Header: /cvs/stx/stx/libscm/mercurial/HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $'
+!
+version_CVS
+^ '$Header: /cvs/stx/stx/libscm/mercurial/HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $'
+!
 version_HG
 ^ '$Changeset: <not expanded> $'
 !
 version_SVN
-^ 'Id::                                                                                                                        '
+^ '$Id: HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $'
 ! !
 HGCommand::resolve initialize!

changeset 419	2f7fa37437e9
parent 403	237ed0ed6c49
parent 418	91d981298a96
child 437	fa687128ae25