--- a/PerforceSourceCodeManager.st Wed May 01 17:58:21 2013 +0100
+++ b/PerforceSourceCodeManager.st Thu May 09 13:20:58 2013 +0100
@@ -393,38 +393,7 @@
createTempDirectory:packageDir forModule:moduleDir
"create a temp directory for checking out"
- |tempdir dir|
-
- "/ if CVSTempDir isNil, use current.
- OsError handle:[:ex |
- self reportError:('cannot create temporary directory').
- ^ nil.
- ] do:[
- tempdir := Filename newTemporaryDirectoryIn:(self perforceTmpDirectory).
- ].
-
- moduleDir notNil ifTrue:[
- dir := tempdir construct:moduleDir.
- dir makeDirectory.
-
- packageDir notNil ifTrue:[
- dir := dir construct:packageDir.
- dir recursiveMakeDirectory.
- ].
- dir exists ifFalse:[
- (tempdir construct:moduleDir) recursiveRemove.
- tempdir recursiveRemove.
- self reportError:('cannot create temporary directory').
- ^ nil.
- ].
- ].
- ^ tempdir
-
- "self createTempDirectory:'fooPackage' forModule:'fooModule'"
-
- "Created: / 09-12-1995 / 19:14:35 / cg"
- "Modified: / 19-12-1995 / 16:13:02 / stefan"
- "Modified: / 29-08-2006 / 13:16:23 / cg"
+ ^ self createTempDirectory:packageDir forModule:moduleDir in:(self perforceTmpDirectory)
!
ensureDollarsInVersionMethod:aString
@@ -1843,9 +1812,9 @@
"/ $-Id: fileName rev date time user state $
"/
(firstWord = ('$','Header:') "/ WARNING: need to split the strings to prevent CVS from expanding them
- or:[firstWord = ('§','Header:')
+ or:[firstWord = ('','Header:')
or:[firstWord = ('$','Id:')
- or:[firstWord = ('§','Id:')]]]) ifTrue:[
+ or:[firstWord = ('','Id:')]]]) ifTrue:[
s skipSeparators.
rest := s upToEnd.
hashIndex := rest indexOf:$#.
@@ -1877,7 +1846,7 @@
Timestamp now printOn:s format:'%h-%m-%s.%i'.
versionInfo time:s contents.
PerforceVersionInfo fromRCSString:versionInfo getVersionString.
- PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
"
"Modified: / 01-06-2012 / 13:32:40 / cg"
@@ -1981,11 +1950,11 @@
!PerforceSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.31 2013-04-27 12:46:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
!
version_HG
@@ -1994,6 +1963,6 @@
!
version_SVN
- ^ '§Id: PerforceSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 §'
+ ^ 'Id: PerforceSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 '
! !