Mercurial Mercurial > hg > stx-libscm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stc compilation fixes
authorvranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
Wed, 14 Nov 2012 01:56:14 +0000
changeset 47 250e5d83e34c
parent 46 d5a192b11a1a
child 48 708eed7103a9
stc compilation fixes
.hgignore file | annotate | diff | comparison | revisions
common/SCMAbstractSourceCodeManager.st file | annotate | diff | comparison | revisions
git/Make.proto file | annotate | diff | comparison | revisions
git/bc.mak file | annotate | diff | comparison | revisions
git/extensions.st file | annotate | diff | comparison | revisions
mercurial/HGNodeId.st file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Nov 14 01:56:14 2012 +0000
@@ -0,0 +1,8 @@
+syntax: glob
+*.o
+*.so
+*.sc
+*Init.c
+*.H
+*.STH
+*/makefile
--- a/common/SCMAbstractSourceCodeManager.st	Wed Nov 14 01:15:30 2012 +0000
+++ b/common/SCMAbstractSourceCodeManager.st	Wed Nov 14 01:56:14 2012 +0000
@@ -263,6 +263,73 @@
     "Modified: / 14-11-2012 / 01:07:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil
+    "check a class into the source repository.
+     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
+     If doCheckClass is true, the class is checked for send of halts etc."
+
+   ^self checkinClasses:(Array with: aClass) withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil
+
+    "Created: / 25-12-2011 / 23:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest
+    |diffSet|
+
+    diffSet := self diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest.
+
+    (Tools::ChangeSetDiffTool new)
+        diffset:diffSet;
+        title:('Differences of %1' bindWith:aProject);
+        open.
+
+    "Created: / 18-01-2012 / 16:04:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+diffSetOfProject: package againstRepositoryVersionFrom:dateOrNil
+
+    self shouldImplement
+
+    "Created: / 15-10-2011 / 23:26:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 14-11-2012 / 01:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+tagClass:aClass as:tag
+
+    Dialog warn: 'Individual class tagging not supported by SubVersion. Tag whole package instead'.
+
+    "Modified: / 12-09-2006 / 13:03:59 / cg"
+    "Created: / 15-10-2011 / 22:48:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+tagClasses:classes as:tag
+
+    Dialog warn: 'Individual class tagging not supported by SubVersion. Tag whole package instead'.
+
+    "Modified: / 12-09-2006 / 13:03:59 / cg"
+    "Created: / 15-10-2011 / 22:49:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
+
+tagPackage: package as:tag
+
+    Dialog warn: 'Not yet implemented'
+
+    "Created: / 12-09-2006 / 13:04:29 / cg"
+    "Created: / 15-10-2011 / 22:49:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !SCMAbstractSourceCodeManager class methodsFor:'documentation'!
 
 version_SVN
--- a/git/Make.proto	Wed Nov 14 01:15:30 2012 +0000
+++ b/git/Make.proto	Wed Nov 14 01:56:14 2012 +0000
@@ -234,7 +234,7 @@
 $(OUTDIR)GitCommit.$(O) GitCommit.$(H): GitCommit.st $(INCLUDE_TOP)/stx/libscm/git/GitObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitLibraryObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitTag.$(O) GitTag.$(H): GitTag.st $(INCLUDE_TOP)/stx/libscm/git/GitObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitLibraryObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)GitTree.$(O) GitTree.$(H): GitTree.st $(INCLUDE_TOP)/stx/libscm/git/GitObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/git/GitLibraryObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractSourceCodeManager__Utilities.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(STCHDR)
+$(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
 
--- a/git/bc.mak	Wed Nov 14 01:15:30 2012 +0000
+++ b/git/bc.mak	Wed Nov 14 01:56:14 2012 +0000
@@ -170,6 +170,6 @@
 $(OUTDIR)GitCommit.$(O) GitCommit.$(H): GitCommit.st $(INCLUDE_TOP)\stx\libscm\git\GitObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitLibraryObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)GitTag.$(O) GitTag.$(H): GitTag.st $(INCLUDE_TOP)\stx\libscm\git\GitObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitLibraryObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)GitTree.$(O) GitTree.$(H): GitTree.st $(INCLUDE_TOP)\stx\libscm\git\GitObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\git\GitLibraryObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractSourceCodeManager__Utilities.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(STCHDR)
+$(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
--- a/git/extensions.st	Wed Nov 14 01:15:30 2012 +0000
+++ b/git/extensions.st	Wed Nov 14 01:56:14 2012 +0000
@@ -72,73 +72,6 @@
     "Created: / 19-09-2012 / 13:57:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil
-    "check a class into the source repository.
-     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
-     If doCheckClass is true, the class is checked for send of halts etc."
-
-   ^self checkinClasses:(Array with: aClass) withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:aManagerOrNil
-
-    "Created: / 25-12-2011 / 23:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest
-    |diffSet|
-
-    diffSet := self diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest.
-
-    (Tools::ChangeSetDiffTool new)
-        diffset:diffSet;
-        title:('Differences of %1' bindWith:aProject);
-        open.
-
-    "Created: / 18-01-2012 / 16:04:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-diffSetOfProject: package againstRepositoryVersionFrom:dateOrNil
-
-    self shouldImplement
-
-    "Created: / 15-10-2011 / 23:26:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 14-11-2012 / 01:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-tagClass:aClass as:tag
-
-    Dialog warn: 'Individual class tagging not supported by SubVersion. Tag whole package instead'.
-
-    "Modified: / 12-09-2006 / 13:03:59 / cg"
-    "Created: / 15-10-2011 / 22:48:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-tagClasses:classes as:tag
-
-    Dialog warn: 'Individual class tagging not supported by SubVersion. Tag whole package instead'.
-
-    "Modified: / 12-09-2006 / 13:03:59 / cg"
-    "Created: / 15-10-2011 / 22:49:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SCMAbstractSourceCodeManager::Utilities methodsFor:'utilities-cvs'!
-
-tagPackage: package as:tag
-
-    Dialog warn: 'Not yet implemented'
-
-    "Created: / 12-09-2006 / 13:04:29 / cg"
-    "Created: / 15-10-2011 / 22:49:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !stx_libscm_git class methodsFor:'documentation'!
 
 extensionsVersion_SVN
--- a/mercurial/HGNodeId.st	Wed Nov 14 01:15:30 2012 +0000
+++ b/mercurial/HGNodeId.st	Wed Nov 14 01:56:14 2012 +0000
@@ -128,20 +128,18 @@
         ].
     ].
     (revno == -1) ifTrue:[
-        hash = #[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] ifTrue:[
-            ^self null
-        ].
-        hash = #[0 0 0 0 0 0] ifTrue:[
+        (hash = #[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] 
+            or:[hash = #[0 0 0 0 0 0]]) ifTrue:[
             ^self null
         ].
     ].
-    ^short ifTrue:[
-        (HGNodeId new: 6)
+    short ifTrue:[
+        ^(HGNodeId new: 6)
             revno: revno;
             replaceBytesFrom: 1 to: 6 with: hash startingAt: 1;
             yourself
     ] ifFalse:[
-        (HGNodeId fromBytes: hash) revno: revno.
+        ^(HGNodeId fromBytes: hash) revno: revno.
     ]
 
     "
hg/stx-libscm