--- a/CVSSourceCodeManager.st Fri Jul 08 06:58:13 2016 +0200
+++ b/CVSSourceCodeManager.st Tue Jul 19 07:09:45 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1995 by Claus Gittinger
All Rights Reserved
@@ -999,11 +997,11 @@
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
"execute command and prepend cvs command name and global options.
if dir ~= nil, execute command in that directory.
- The doLog argument, if false supresses a logEntry to be added
+ The doLog argument, if false suppresses a logEntry to be added
in the cvs log file (used when reading / extracting history)"
^ self
- executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
+ executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
pipe:false
!
@@ -1020,15 +1018,15 @@
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog outputTo:outStream errorTo:errorStream
"execute command and prepend cvs command name and global options.
execute command in the dirArg directory.
- The doLog argument, if false supresses a logEntry to be added
+ The doLog argument, if false suppresses a logEntry to be added
in the cvs log file (used when reading / extracting history)"
- ^ self
- executeCVSCommand:cvsCommand
- module:moduleName
- inDirectory:dirArg
- log:doLog
- pipe:false
+ ^ self
+ executeCVSCommand:cvsCommand
+ module:moduleName
+ inDirectory:dirArg
+ log:doLog
+ pipe:false
orElseOutputTo:outStream errorTo:errorStream
"Modified: / 23-04-1996 / 15:24:00 / stefan"
@@ -1037,18 +1035,18 @@
"Modified: / 28-02-2012 / 17:31:34 / cg"
!
-executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
+executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
"execute command and prepend cvs command name and global options.
execute command in the dirArg directory.
- The doLog argument, if false supresses a logEntry to be added
+ The doLog argument, if false suppresses a logEntry to be added
in the cvs log file (used when reading / extracting history)"
-
- ^ self
- executeCVSCommand:cvsCommand
- module:moduleName
- inDirectory:dirArg
- log:doLog
- pipe:doPipe
+
+ ^ self
+ executeCVSCommand:cvsCommand
+ module:moduleName
+ inDirectory:dirArg
+ log:doLog
+ pipe:doPipe
orElseOutputTo:nil errorTo:nil
"Modified: / 23-04-1996 / 15:24:00 / stefan"
@@ -1061,9 +1059,9 @@
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe orElseOutputTo:outStreamOrNil errorTo:errorStreamOrNil
"execute command and prepend cvs command name and global options.
execute command in the dirArg directory (or the current directory if dirArg is nil).
- The doLog argument, if false supresses a logEntry to be added
+ The doLog argument, if false suppresses a logEntry to be added
in the cvs log file (used when reading / extracting history)"
-
+
|command cvsRoot rslt ok pathOfDir errorString|
dirArg notNil ifTrue:[
@@ -1098,7 +1096,7 @@
].
doPipe ifTrue:[
- rslt := PipeStream
+ rslt := PipeStream
readingFrom:command
errorDisposition:#inline
inDirectory:pathOfDir.
@@ -1109,22 +1107,22 @@
"/ phase (when threading is not yet enabled in the ProcessorScheduler)
"/ execute the command in this thread, as opposed to the code below.
(outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
- rslt := ok := OperatingSystem executeCommand:command
- inputFrom:nil
- outputTo:outStreamOrNil
- errorTo:errorStreamOrNil
+ rslt := ok := OperatingSystem executeCommand:command
+ inputFrom:nil
+ outputTo:outStreamOrNil
+ errorTo:errorStreamOrNil
auxFrom:nil
inDirectory:pathOfDir
lineWise:false
onError:[:status| false].
] ifFalse:[
- rslt := ok := OperatingSystem
+ rslt := ok := OperatingSystem
executeCommand:command
errorTo:nil
inDirectory:pathOfDir.
].
] ifTrue:[
- CVSCommandSemaphore
+ CVSCommandSemaphore
critical:[
|p errOut done|
@@ -1132,15 +1130,15 @@
p := [
(outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
rslt := ok := OperatingSystem executeCommand:command
- inputFrom:nil
- outputTo:outStreamOrNil
- errorTo:errorStreamOrNil
+ inputFrom:nil
+ outputTo:outStreamOrNil
+ errorTo:errorStreamOrNil
auxFrom:nil
inDirectory:pathOfDir
lineWise:false
onError:[:status| false].
] ifFalse:[
- rslt := ok := OperatingSystem
+ rslt := ok := OperatingSystem
executeCommand:command
outputTo:errOut
errorTo:errOut
@@ -1152,7 +1150,7 @@
[done] whileFalse:[
done := true.
(p waitUntilTerminatedWithTimeout:self cvsCommandTimeout asSeconds) ifTrue:[
- (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs
+ (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs
bindWith:self cvsCommandTimeout with:command)) ifTrue:[
done := false
] ifFalse:[
@@ -4737,17 +4735,17 @@
"/ The repair code will be removed at some time in the future...
"/ temporary fix Felix' bad string translation:
- (aString startsWith:'§Header:') ifTrue:[
- (aString endsWith:'Exp §') ifTrue:[
+ (aString startsWith:'§Header:') ifTrue:[
+ (aString endsWith:'Exp §') ifTrue:[
fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
aClass isNil ifTrue:[
autoFixHolder value ifFalse:[
- Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+ Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
]
] ifFalse:[
(autoFixHolder value
- or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+ or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
) ifTrue:[
self updateVersionMethodOf:aClass for:fixedString.
].
@@ -4755,7 +4753,7 @@
].
].
- "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+ "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
(aString startsWith:'Header: ') ifTrue:[
(aString endsWith:'Exp ') ifTrue:[
fixedString := '$' , aString , '$'.