--- a/extensions.st Fri Apr 15 17:44:08 2011 +0200
+++ b/extensions.st Fri Apr 15 17:44:25 2011 +0200
@@ -277,7 +277,8 @@
!OSProcess methodsFor:'accessing'!
arguments
- ^ arguments ? #()
+ self halt:'oops - no arguments'.
+ ^ "arguments ?" #()
"Created: / 15-03-2008 / 18:09:37 / janfrog"
! !
@@ -298,9 +299,9 @@
cmdStream := String new writeStream.
cmdStream nextPutAll:self executable.
self arguments do:
- [:arg|
- cmdStream space.
- cmdStream nextPutAll:(self asShellQuotedArgument: arg)].
+ [:arg|
+ cmdStream space.
+ cmdStream nextPutAll:(self asShellQuotedArgument: arg)].
^cmdStream contents utf8Encoded
@@ -354,21 +355,21 @@
execute
"
self synchronized:
- [runningLock
- ifNotNil:[self error:'Process already running']
- ifNil:[runningLock := Semaphore new:0]].
+ [runningLock
+ ifNotNil:[self error:'Process already running']
+ ifNil:[runningLock := Semaphore new:0]].
[["
- (OperatingSystem
- executeCommand: self asShellCommandString
- inputFrom: self stdin
- outputTo: self stdout
- errorTo: self stderr
- auxFrom: nil
- environment: nil
- inDirectory: self workdir asString
- lineWise: (self stdout = self stderr)
- onError:[:value|exitValue := value code.false])
- ifTrue:[exitValue := 0]
+ (OperatingSystem
+ executeCommand: self asShellCommandString
+ inputFrom: self stdin
+ outputTo: self stdout
+ errorTo: self stderr
+ auxFrom: nil
+ environment: nil
+ inDirectory: self workdir asString
+ lineWise: (self stdout = self stderr)
+ onError:[:value|exitValue := value code.false])
+ ifTrue:[exitValue := 0]
"
] ensure:[runningLock signalForAll. runningLock := nil]] fork
"
@@ -443,9 +444,9 @@
"| lock |
self synchronized:
- [runningLock
- ifNil:[^self]
- ifNotNil:[lock := runningLock]].
+ [runningLock
+ ifNil:[^self]
+ ifNotNil:[lock := runningLock]].
lock wait"
"Created: / 15-03-2008 / 18:32:41 / janfrog"
@@ -477,32 +478,32 @@
aString := anObject asString.
(aString first = $' and: [aString last = $'])
- ifTrue:[^aString].
+ ifTrue:[^aString].
(aString first = $" and: [aString last = $"])
- ifTrue:[^aString].
+ ifTrue:[^aString].
(aString allSatisfy:
- [:char|char isSeparator not and: [(#($" $< $> $& $# $; $\) includes: char) not]])
- ifTrue:[^aString].
+ [:char|char isSeparator not and: [(#($" $< $> $& $# $; $\) includes: char) not]])
+ ifTrue:[^aString].
unquotedStream := aString readStream.
quotedStream := (String new: aString size + 10) writeStream.
quotedStream nextPut: $".
[ unquotedStream atEnd ] whileFalse:
- [|char|
- char := unquotedStream next.
- (#($" $\) includes: char) ifTrue:[quotedStream nextPut: $\].
- quotedStream nextPut: char].
+ [|char|
+ char := unquotedStream next.
+ (#($" $\) includes: char) ifTrue:[quotedStream nextPut: $\].
+ quotedStream nextPut: char].
quotedStream nextPut: $".
^quotedStream contents.
"
- OSProcess asShellQuotedArgument: 'Hello' .
- OSProcess asShellQuotedArgument: 'Hello world'
- OSProcess asShellQuotedArgument: 'Hello'' world'
- OSProcess asShellQuotedArgument: 'Hello
- World'
+ OSProcess asShellQuotedArgument: 'Hello' .
+ OSProcess asShellQuotedArgument: 'Hello world'
+ OSProcess asShellQuotedArgument: 'Hello'' world'
+ OSProcess asShellQuotedArgument: 'Hello
+ World'
"
"Created: / 10-10-2008 / 12:32:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -995,118 +996,118 @@
^
#(Menu
- (
- (MenuItem
- enabled: false
- label: 'Branch'
- translateLabel: true
- submenuChannel: projectMenuSubversionBranches
- labelImage: (ResourceRetriever #'SVN::IconLibrary' checkout 'Branch')
- keepLinkedMenu: true
- )
- (MenuItem
- label: 'Commit'
- itemValue: projectMenuSubversionCommit
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
- )
- (MenuItem
- label: 'Update'
- itemValue: projectMenuSubversionUpdate
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Browse revision log'
- itemValue: projectMenuSubversionShowRevisionLog
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' log 'Browse revision log')
- )
- (MenuItem
- label: 'Browse working copy'
- itemValue: projectMenuSubversionBrowseWorkingCopy
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Compare with revision HEAD'
- itemValue: projectMenuSubversionCompareImageWithRevisionHEAD
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
- )
- (MenuItem
- label: 'Compare with revision'
- itemValue: projectMenuSubversionCompareImageWithRevision
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Merge with revision HEAD'
- itemValue: projectMenuSubversionMergeImageWithRevisionHEAD
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision HEAD')
- )
- (MenuItem
- label: 'Merge with revision'
- itemValue: projectMenuSubversionMergeImageWithRevision
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'More'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Load revision...'
- itemValue: projectMenuSubversionLoadRevision
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Remove working copy'
- itemValue: projectMenuSubversionRemoveWorkingCopy
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleProjectSelected
- label: 'Fast commit'
- translateLabel: true
- choice: projectMenuSubversionCommitMode
- choiceValue: fast
- )
- (MenuItem
- enabled: hasSingleProjectSelected
- label: 'Full commit'
- translateLabel: true
- choice: projectMenuSubversionCommitMode
- choiceValue: full
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ enabled: false
+ label: 'Branch'
+ translateLabel: true
+ submenuChannel: projectMenuSubversionBranches
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' checkout 'Branch')
+ keepLinkedMenu: true
+ )
+ (MenuItem
+ label: 'Commit'
+ itemValue: projectMenuSubversionCommit
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
+ )
+ (MenuItem
+ label: 'Update'
+ itemValue: projectMenuSubversionUpdate
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Browse revision log'
+ itemValue: projectMenuSubversionShowRevisionLog
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' log 'Browse revision log')
+ )
+ (MenuItem
+ label: 'Browse working copy'
+ itemValue: projectMenuSubversionBrowseWorkingCopy
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Compare with revision HEAD'
+ itemValue: projectMenuSubversionCompareImageWithRevisionHEAD
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
+ )
+ (MenuItem
+ label: 'Compare with revision'
+ itemValue: projectMenuSubversionCompareImageWithRevision
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Merge with revision HEAD'
+ itemValue: projectMenuSubversionMergeImageWithRevisionHEAD
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision HEAD')
+ )
+ (MenuItem
+ label: 'Merge with revision'
+ itemValue: projectMenuSubversionMergeImageWithRevision
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'More'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Load revision...'
+ itemValue: projectMenuSubversionLoadRevision
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Remove working copy'
+ itemValue: projectMenuSubversionRemoveWorkingCopy
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleProjectSelected
+ label: 'Fast commit'
+ translateLabel: true
+ choice: projectMenuSubversionCommitMode
+ choiceValue: fast
+ )
+ (MenuItem
+ enabled: hasSingleProjectSelected
+ label: 'Full commit'
+ translateLabel: true
+ choice: projectMenuSubversionCommitMode
+ choiceValue: full
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
)
! !
@@ -1126,7 +1127,7 @@
"subversion source control configurations"
^(self at:#'libsvn.configurations' ifAbsent:#())
- collect:[:cfg|cfg decodeAsLiteralArray]
+ collect:[:cfg|cfg decodeAsLiteralArray]
"Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -1139,14 +1140,14 @@
(SVN::RepositoryManager notNil
and:[ SVN::RepositoryManager isLoaded ]) ifTrue:[
- SVN::RepositoryManager allInstances do:[:e|
- e configurations: aCollection
- ]
+ SVN::RepositoryManager allInstances do:[:e|
+ e configurations: aCollection
+ ]
].
^ self
- at: #'libsvn.configurations'
- put: (aCollection asArray collect:[:cfg|cfg literalArrayEncoding])
+ at: #'libsvn.configurations'
+ put: (aCollection asArray collect:[:cfg|cfg literalArrayEncoding])
"
UserPreferences current svnConfigurations: #()
@@ -1211,4 +1212,4 @@
extensionsVersion_CVS
^ '$Header$'
-! !
\ No newline at end of file
+! !