Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PerforceSourceCodeManagerUtilities.st
changeset 17506 479a4fc186f8
parent 17088 4492c6d91ac5
child 18738 06bf06615012 
--- a/PerforceSourceCodeManagerUtilities.st	Tue May 16 14:19:31 2017 +0200
+++ b/PerforceSourceCodeManagerUtilities.st	Tue May 16 17:31:22 2017 +0200
@@ -3137,44 +3137,48 @@
 
 !PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'command execution'!
 
-executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
-        errorTo:errorStream 
+executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
+        errorTo:errorStream
     "execute command and prepend perforce 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 executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
+    ^self executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
         errorTo:errorStream
         doLog:true
+
+    "Modified (comment): / 16-05-2017 / 17:20:11 / mawalch"
 !
 
-executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
+executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
         errorTo:errorStream
         doLog:doLog
     "execute command and prepend perforce 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 executePerforceCommand:perforceCommand inDirectory:dirArg 
-            inputFrom:inputStream outputTo:outputStream 
+    ^self executePerforceCommand:perforceCommand inDirectory:dirArg
+            inputFrom:inputStream outputTo:outputStream
             errorTo:errorStream
             doLog:doLog
             logHeader:nil
+
+    "Modified (comment): / 16-05-2017 / 17:20:29 / mawalch"
 !
 
-executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
+executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
         errorTo:errorStream
         doLog:doLog
         logHeader:logHeader
     "execute command and prepend perforce 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)"
 
     |command rslt pathOfDir errorString  timeout errorMsgStream executeStream|
@@ -3208,7 +3212,7 @@
                                 onError:[:status| false].
             ] fork.
 
-            timeout := (p waitUntilTerminatedWithTimeout:300). 
+            timeout := (p waitUntilTerminatedWithTimeout:300).
             timeout ifTrue:[
                 ('PerforceSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
                 rslt := false.
@@ -3260,22 +3264,26 @@
         ].
     ].
     ^ rslt.
+
+    "Modified (comment): / 16-05-2017 / 17:20:42 / mawalch"
 !
 
-executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
-        errorTo:errorStream 
+executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
+        errorTo:errorStream
         logHeader:logHeader
     "execute command and prepend perforce 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 executePerforceCommand:perforceCommand inDirectory:dirArg 
-        inputFrom:inputStream outputTo:outputStream 
+    ^self executePerforceCommand:perforceCommand inDirectory:dirArg
+        inputFrom:inputStream outputTo:outputStream
         errorTo:errorStream
         doLog:true
         logHeader:logHeader.
+
+    "Modified (comment): / 16-05-2017 / 17:20:53 / mawalch"
 !
 
 getCommandOptionsForCommand:perforceCommand
hg/stx-libtool