*** empty log message *** cvs_MAIN
authorClaus Gittinger <cg@exept.de>
Tue, 02 Jul 2019 09:17:15 +0200
branchcvs_MAIN
changeset 876 2643ba2d9c52
parent 875 7598f4884bbf
child 877 ed55127e1176
*** empty log message ***
git/GitPackageModel.st
git/GitPackageModelRegistry.st
git/Make.proto
--- a/git/GitPackageModel.st	Sat Jun 08 13:52:57 2019 +0200
+++ b/git/GitPackageModel.st	Tue Jul 02 09:17:15 2019 +0200
@@ -31,9 +31,9 @@
 ensureWorkingCopy
     "Nothing to do, got GIT, there is always WC"
 
-    wc isNil ifTrue:[
-        self wc: repository workingCopy
-    ]
+    "/ wc isNil ifTrue:[
+    "/      self wc: repository workingCopy
+    "/ ]
 
     "Created: / 07-10-2012 / 09:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 14-11-2012 / 00:32:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/git/GitPackageModelRegistry.st	Sat Jun 08 13:52:57 2019 +0200
+++ b/git/GitPackageModelRegistry.st	Tue Jul 02 09:17:15 2019 +0200
@@ -1,6 +1,6 @@
 "{ Package: 'stx:libscm/git' }"
 
-SCMAbstractPackageModelRegistry subclass:#GitPackageModelRegistry
+SCMAbstractPackageWorkingCopyRegistry subclass:#GitPackageModelRegistry
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -20,8 +20,8 @@
     dir := Smalltalk getPackageDirectoryForPackage: package.
     dir := GitRepository discover: dir.
     dir isNil ifTrue:[
-        GitError raiseErrorString: 'No repository found for package ',package.
-        ^nil.
+	GitError raiseErrorString: 'No repository found for package ',package.
+	^nil.
     ].
     repo := repositories at: dir ifAbsentPut: [ GitRepository open: dir ].
     ^packages at: package ifAbsentPut: [ GitPackageModel name: package repository: repo ].
--- a/git/Make.proto	Sat Jun 08 13:52:57 2019 +0200
+++ b/git/Make.proto	Tue Jul 02 09:17:15 2019 +0200
@@ -63,7 +63,7 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  
+pre_objs::
 
 
 
@@ -78,7 +78,7 @@
 		echo -n exported > .svnversion; \
 	fi
 
-stx_libscm_git.o: stx_libscm_git.st .svnversion 
+stx_libscm_git.o: stx_libscm_git.st .svnversion
 	@if [ -d .svn ]; then \
 		rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
 		echo "  [SV]  Expanding svnRevisionNo in $1.st"; \
@@ -87,7 +87,7 @@
 	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libscm_git.svn $(C_RULE);
 	sed -i -e "s/\".stx_libscm_git.svn.st\");/\"\stx_libscm_git.st\");/g" .stx_libscm_git.svn.c
 	$(MAKE) .stx_libscm_git.svn.$(O)
-	@mv .stx_libscm_git.svn.$(O) stx_libscm_git.$(O) 
+	@mv .stx_libscm_git.svn.$(O) stx_libscm_git.$(O)
 endif
 
 
@@ -169,7 +169,7 @@
 $(OUTDIR)GitOid.$(O) GitOid.$(H): GitOid.st $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitOidShortenHandle.$(O) GitOidShortenHandle.$(H): GitOidShortenHandle.st $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitPackageModel.$(O) GitPackageModel.$(H): GitPackageModel.st $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)GitPackageModelRegistry.$(O) GitPackageModelRegistry.$(H): GitPackageModelRegistry.st $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModelRegistry.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)GitPackageModelRegistry.$(O) GitPackageModelRegistry.$(H): GitPackageModelRegistry.st $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageWorkingCopyRegistry.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitPrimitives.$(O) GitPrimitives.$(H): GitPrimitives.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitRefType.$(O) GitRefType.$(H): GitRefType.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitReferenceHandle.$(O) GitReferenceHandle.$(H): GitReferenceHandle.st $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -237,4 +237,3 @@
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
-