60490

20040 integrate iceberg
	https://pharo.fogbugz.com/f/cases/20040

http://files.pharo.org/image/60/60490.zip

BaselineOfIDE.package/BaselineOfIDE.class/instance/actions/additionalInitialization.st

@@ -57,6 +57,8 @@ additionalInitialization
 
 	Pharo3DarkTheme beCurrent.
 
-	3 timesRepeat: [
+		3 timesRepeat: [
 		Smalltalk garbageCollect.
-		Undeclared removeUnreferencedKeys.].
+		Undeclared removeUnreferencedKeys.].
+
+	self loadIceberg.

BaselineOfIDE.package/BaselineOfIDE.class/instance/actions/loadIceberg.st

@@ -0,0 +1,7 @@
+loadIceberg
+
+	Metacello new
+		baseline: 'Iceberg';
+		repository: 'github://pharo-vcs/iceberg:v0.4';
+		load.
+	(Smalltalk classNamed: #Iceberg) enableMetacelloIntegration: false.

BaselineOfIceberg.package/BaselineOfIceberg.class/README.md

@@ -0,0 +1 @@
+Please comment me using the following template inspired by Class Responsibility Collaborator (CRC) design:For the Class part:  State a one line summary. For example, "I represent a paragraph of text".For the Responsibility part: Three sentences about my main responsibilities - what I do, what I know.For the Collaborators Part: State my main collaborators and one line about how I interact with them. Public API and Key Messages- message one   - message two - (for bonus points) how to create instances.   One simple example is simply gorgeous. Internal Representation and Key Implementation Points.    Implementation Points

BaselineOfIceberg.package/BaselineOfIceberg.class/definition.st

@@ -0,0 +1,5 @@
+BaselineOf subclass: #BaselineOfIceberg
+	instanceVariableNames: ''
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'BaselineOfIceberg'

BaselineOfIceberg.package/BaselineOfIceberg.class/instance/accessing/customProjectAttributes.st

@@ -0,0 +1,4 @@
+customProjectAttributes
+	Smalltalk os isMacOS ifTrue: [ ^ #(#MacOS) ].
+	Smalltalk os isUnix ifTrue: [ ^ #(#Unix) ].
+	Smalltalk os isWindows ifTrue: [ ^ #(#Windows) ]

BaselineOfIceberg.package/BaselineOfIceberg.class/instance/baseline/baseline_.st

@@ -0,0 +1,45 @@
+baseline: spec
+	<baseline>
+	spec for: #common do: [ spec
+		configuration: 'OSSubprocess' with: [ spec
+			versionString: #stable;
+			repository: 'github://marianopeck/OSSubprocess/repository' ];
+		configuration: 'ProcessWrapper' with: [ spec
+			versionString: #stable;
+			repository: 'http://smalltalkhub.com/mc/Pharo/MetaRepoForPharo50/main' ];
+
+		baseline: 'FileTree' with: [ spec
+			repository: 'github://pharo-vcs/filetree:pharo6.0_dev/repository';
+			loads: 'Git' ];
+		baseline: 'LibGit' with: [ spec
+			repository: 'github://pharo-vcs/libgit2-pharo-bindings:development';
+  			loads: 'default' ];
+		project: 'LibGit-Tests'
+          copyFrom: 'LibGit'
+          with: [ spec loads: #('tests') ];
+
+		for: #MacOS do: [ spec
+			package: 'Iceberg-GitCommand'
+			with: [ spec requires: #('OSSubprocess') ] ];
+		for: #Unix do: [ spec
+			package: 'Iceberg-GitCommand'
+			with: [ spec requires: #('OSSubprocess' ) ] ];
+		for: #Windows do: [ spec
+			package: 'Iceberg-GitCommand'
+			with: [ spec requires: #('ProcessWrapper') ] ];
+
+		package: 'Iceberg';
+		package: 'Iceberg-Plugin';
+		package: 'Iceberg-Metacello-Integration' with: [ spec requires: #('Iceberg')];
+		package: 'Iceberg-UI' with: [ spec requires: #('Iceberg' 'Iceberg-Plugin') ];
+		package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-GitCommand') ];
+		package: 'Iceberg-UI-Tests' with: [ spec requires: #('Iceberg-UI' 'Iceberg-Tests')];
+		package: 'Iceberg-GitFileTree' with: [ spec requires: #('Iceberg' 'FileTree') ];
+		package: 'Iceberg-GitFileTree-Tests' with: [ spec requires: #('Iceberg-GitFileTree' 'Iceberg-Tests') ];
+		package: 'Iceberg-Libgit' with: [ spec requires: #('Iceberg' 'LibGit') ];
+
+		group: 'minimal' with: #('Iceberg' 'Iceberg-Libgit');
+		group: 'default' with: #(minimal 'Iceberg-Metacello-Integration' 'Iceberg-UI');
+		group: 'allTests' with: #('Iceberg-Tests' 'LibGit-Tests' 'Iceberg-GitFileTree-Tests' 'Iceberg-UI-Tests' );
+		group: 'development' with: #(default 'Iceberg-GitFileTree' allTests)
+	]

BaselineOfLibGit.package/BaselineOfLibGit.class/README.md

@@ -0,0 +1 @@
+Please comment me using the following template inspired by Class Responsibility Collaborator (CRC) design:For the Class part:  State a one line summary. For example, "I represent a paragraph of text".For the Responsibility part: Three sentences about my main responsibilities - what I do, what I know.For the Collaborators Part: State my main collaborators and one line about how I interact with them. Public API and Key Messages- message one   - message two - (for bonus points) how to create instances.   One simple example is simply gorgeous. Internal Representation and Key Implementation Points.    Implementation Points

BaselineOfLibGit.package/BaselineOfLibGit.class/definition.st

@@ -0,0 +1,5 @@
+BaselineOf subclass: #BaselineOfLibGit
+	instanceVariableNames: ''
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'BaselineOfLibGit'

BaselineOfLibGit.package/BaselineOfLibGit.class/instance/baseline/baseline_.st

@@ -0,0 +1,20 @@
+baseline: spec
+  <baseline>
+  spec
+    for: #(common)
+    do: [ 
+      spec
+        package: 'LibGit-Tests' with: [ spec requires: 'LibGit-Core' ];
+        package: 'LibGit-GT' with: [ spec requires: 'LibGit-Core' ];
+        package: 'LibGit-Patches' with: [ spec requires: 'LibGit-Core' ];
+        package: 'LibGit-Core'.
+      spec
+        group: 'default'
+        with: #('LibGit-Core').
+		spec
+			group: 'development'
+			with: #('default' 'LibGit-Tests' 'LibGit-Patches' 'LibGit-GT').
+		spec
+			group: 'tests'
+			with: #('LibGit-Tests').
+		spec postLoadDoIt: #postLoadActions ]

BaselineOfLibGit.package/BaselineOfLibGit.class/instance/doits/changeRepositoryType.st

@@ -0,0 +1,20 @@
+changeRepositoryType
+	| repos newRepo |
+	(Smalltalk hasClassNamed: #MCGitRepository) ifFalse: [ ^ self ].
+
+	repos := MCRepositoryGroup default repositories
+		select: [ :r | (r description includesSubstring: 'LibGit:master') or: [ 
+			r description includesSubstring: 'LibGit/master' ] ].
+	repos ifEmpty: [  ^ self ].
+
+	'github-cache/theseion' asFileReference deleteAll.
+	newRepo := (Smalltalk at: #MCGitRepository) new
+		repoUrl: 'git@github.com:theseion/LibGit';
+		ensureDirectory;
+		yourself.
+
+	MCRepositoryGroup allInstances
+		select: [ :group | group repositories includesAnyOf: repos ]
+		thenDo: [ :group | 
+			repos do: [ :repo | group removeRepository: repo ].
+			group addRepository: newRepo ]

BaselineOfLibGit.package/BaselineOfLibGit.class/instance/doits/postLoadActions.st

@@ -0,0 +1,2 @@
+postLoadActions
+	self changeRepositoryType

Iceberg-Libgit.package/IceLibgitCommitWalk.class/README.md

@@ -0,0 +1 @@
+Utility class for searching through a commit history taking advantage of git revwalk utilities. Found and returned commits will be added to the commit cache of the corresponding IceRepository.

Iceberg-Libgit.package/IceLibgitCommitWalk.class/definition.st

@@ -0,0 +1,5 @@
+IceAbstractCommitWalk subclass: #IceLibgitCommitWalk
+	instanceVariableNames: 'revwalk lgitRepository'
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'Iceberg-Libgit'

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/accessing/revwalk.st

@@ -0,0 +1,10 @@
+revwalk
+	^ revwalk ifNil: [
+		repository withRepoDo: [ :repo |
+			"Keep a reference to the repo so that it does not get garbage collected 
+			(that would free C memory and make leave the revwalk object dumb)"
+
+			lgitRepository := repo. 
+			^ revwalk := LGitRevwalk of: repo.
+		]
+ 	]

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/private/rawResultsDo_.st

@@ -0,0 +1,4 @@
+rawResultsDo: aBlockClosure 
+	self revwalk 
+		select: [ :result | self shouldInclude: result ]
+		thenDo: aBlockClosure

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/private/shouldInclude_.st

@@ -0,0 +1,5 @@
+shouldInclude: aLGitCommit 
+	^ self modifyingPackage 
+		ifNil: [ true ]
+		ifNotNil: [ :package | 
+			aLGitCommit changesFileNamed: package directoryPathString ]

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromBranch_.st

@@ -0,0 +1,8 @@
+fromBranch: branch
+	[ self revwalk pushReference: (lgitRepository lookupBranch: branch name) ]
+		on: LGit_GIT_EINVALIDSPEC do: [
+			"branch real branch, so try to find a corresponding treeish using revparse, 
+			this will handle stuff like 'master~1'"
+			self fromLGitId: (lgitRepository revparse: branch name) id
+		]
+

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromCommitId_.st

@@ -0,0 +1,2 @@
+fromCommitId: commitId
+	self fromLGitId: (LGitId fromHexString: commitId)

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromCommit_.st

@@ -0,0 +1,2 @@
+fromCommit: commit
+	self fromCommitId: commit id

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromHead.st

@@ -0,0 +1,2 @@
+fromHead
+	self revwalk pushHead

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromLGitId_.st

@@ -0,0 +1,2 @@
+fromLGitId: lGitId
+	self revwalk pushCommit: lGitId

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/fromTag_.st

@@ -0,0 +1,4 @@
+fromTag: tag
+	self revwalk.
+	^ self fromLGitId: (lgitRepository revparse: tag name) id
+

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walk definition/uptoCommit_.st

@@ -0,0 +1,2 @@
+uptoCommit: commit
+	self revwalk hideCommit: (LGitId fromHexString: commit id)

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walking/commitsDo_.st

@@ -0,0 +1,11 @@
+commitsDo: aBlock 
+	self maxNumber 
+		ifNil: [ super commitsDo: aBlock ]
+		ifNotNil: [ | count |
+			count := 0.
+			super commitsDo: [ :commit |
+				aBlock value: commit.
+				count := count + 1.
+				count == self maxNumber ifTrue: [ ^ self ]
+			]
+		]

Iceberg-Libgit.package/IceLibgitCommitWalk.class/instance/walking/firstCommit.st

@@ -0,0 +1,2 @@
+firstCommit
+	^ self commitsDo: [ :commit | ^ commit ] 

Iceberg-Libgit.package/IceLibgitFileUtils.class/README.md

@@ -0,0 +1 @@
+Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository.

Iceberg-Libgit.package/IceLibgitFileUtils.class/class/instance creation/current.st

@@ -0,0 +1,2 @@
+current
+    ^ Current ifNil: [ Current := self new ]

Iceberg-Libgit.package/IceLibgitFileUtils.class/definition.st

@@ -0,0 +1,5 @@
+Object subclass: #IceLibgitFileUtils
+	instanceVariableNames: ''
+	classVariableNames: 'Current'
+	poolDictionaries: ''
+	category: 'Iceberg-Libgit'

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/as yet unclassified/pathNameDelimiter.st

@@ -0,0 +1,2 @@
+pathNameDelimiter
+	^ $/

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/deleteAll_.st

@@ -0,0 +1,2 @@
+deleteAll: aTreeBuilder 
+    ^ aTreeBuilder deleteAll

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/directoryExists_.st

@@ -0,0 +1,2 @@
+directoryExists: aLGitTreeEntry 
+	^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/directoryFromEntry_.st

@@ -0,0 +1,2 @@
+directoryFromEntry: treeEntry 
+	^ treeEntry object

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/directoryFromPath_relativeTo_.st

@@ -0,0 +1,6 @@
+directoryFromPath: aString relativeTo: aCommitOrTree
+	^ aCommitOrTree 
+		entryByPath: aString 
+		ifAbsent: [ 
+			IceMissingRepositoryEntry new name: aString; owner: aCommitOrTree; signal ]
+

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/readStreamFor_in_do_.st

@@ -0,0 +1,2 @@
+readStreamFor: fileName in: tree do: aBlock
+	(tree entryByPath: fileName) readStreamDo: aBlock

Iceberg-Libgit.package/IceLibgitFileUtils.class/instance/utilities/writeStreamFor_in_do_.st

@@ -0,0 +1,2 @@
+writeStreamFor: fileName in: directory do: aBlock 
+	directory addEntryNamed: fileName withContents: (String streamContents: aBlock).

Iceberg-Libgit.package/IceLibgitLocalRepository.class/README.md

@@ -0,0 +1 @@
+Adapter which allows an IceRepository to use libgit as underlying storage.

Iceberg-Libgit.package/IceLibgitLocalRepository.class/class/descriptions/description.st

@@ -0,0 +1,2 @@
+description
+	^ 'Libgit'

Iceberg-Libgit.package/IceLibgitLocalRepository.class/class/instance creation/newRepositoryAt_origin_subdirectory_.st

@@ -0,0 +1,6 @@
+newRepositoryAt: aFileReference origin: anIceRemoteRepository subdirectory: aString
+	^ self new
+		location: aFileReference;
+		origin: anIceRemoteRepository;
+		subdirectory: aString;
+		yourself

Iceberg-Libgit.package/IceLibgitLocalRepository.class/class/instance creation/newRepositoryAt_subdirectory_.st

@@ -0,0 +1,5 @@
+newRepositoryAt: aFileReference subdirectory: aString
+	^ self new
+		location: aFileReference;
+		subdirectory: aString;
+		yourself

Iceberg-Libgit.package/IceLibgitLocalRepository.class/class/printing/shortName.st

@@ -0,0 +1,2 @@
+shortName
+	^ 'Libgit'

Iceberg-Libgit.package/IceLibgitLocalRepository.class/class/private/parseCommitInfo_.st

@@ -0,0 +1,7 @@
+parseCommitInfo: aLGitCommit
+	^ IceCommitInfo new
+		commitId: aLGitCommit id hexString;
+		username: aLGitCommit committer name;
+		datetime: aLGitCommit time asDateAndTime;
+		parentIds: (aLGitCommit parents collect: [ :parent | parent id hexString ]);
+		comment: aLGitCommit message

Iceberg-Libgit.package/IceLibgitLocalRepository.class/definition.st

@@ -0,0 +1,6 @@
+Object subclass: #IceLibgitLocalRepository
+	uses: TIceRepositoryBackend
+	instanceVariableNames: 'location subdirectory branch frontend'
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'Iceberg-Libgit'

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/branch.st

@@ -0,0 +1,3 @@
+branch
+	"The branch variable and this accessor are useful when you do not have a real git repository yet. Once created it might be safer to use #currentBranch instead."
+	^ branch ifNil: [ branch := self lookupHead ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/branch_.st

@@ -0,0 +1,2 @@
+branch: aBranch
+	branch := aBranch

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/frontend.st

@@ -0,0 +1,2 @@
+frontend
+	^ frontend

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/frontend_.st

@@ -0,0 +1,2 @@
+frontend: anObject
+	frontend := anObject

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/location.st

@@ -0,0 +1,2 @@
+location
+	^ location

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/location_.st

@@ -0,0 +1,2 @@
+location: anObject
+	location := anObject

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/origin.st

@@ -0,0 +1,7 @@
+origin
+	| remotes |
+	remotes := self remotes.
+	remotes ifEmpty: [ ^ nil  ].
+	^ remotes
+		detect: [ :each | each isOrigin ]
+		ifNone: [ remotes first ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/remotes.st

@@ -0,0 +1,7 @@
+remotes
+	| gitRemotes |
+	self withRepoDo: [ :repo | gitRemotes := repo allRemotes ].
+	^ gitRemotes collect: [ :each | 
+		(IceRemote url: each url)
+			remoteName: each remoteName;
+			yourself ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/repositoryDirectory.st

@@ -0,0 +1,2 @@
+repositoryDirectory
+	^ self location

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/subdirectory.st

@@ -0,0 +1,2 @@
+subdirectory
+	^ subdirectory

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/subdirectory_.st

@@ -0,0 +1,2 @@
+subdirectory: anObject
+	subdirectory := anObject

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/username_email_global_.st

@@ -0,0 +1,9 @@
+username: aName email: anEmail global: globalBoolean
+	"set user.name and user.email properties. 
+	 this could be a nonsense with other backends, but git has them and needs them :)"
+	self withRepoDo: [ :repo | | config |
+		config := repo config.
+		globalBoolean ifTrue: [ config := config openGlobal ].
+		config 
+			setString: 'user.name' to: aName;
+			setString: 'user.email' to: anEmail ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/actions/addFilesToIndex_.st

@@ -0,0 +1,7 @@
+addFilesToIndex: aListOfPaths
+	self withRepoDo: [ :repo | 
+		| index |
+		index := repo index.
+		index addAll: aListOfPaths.
+		index writeToDisk.
+	]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/actions/addRemote_.st

@@ -0,0 +1,3 @@
+addRemote: aRemote
+	self withRepoDo: [ :repo |
+		repo addRemote: aRemote remoteName url: aRemote url ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/actions/checkoutBranch_.st

@@ -0,0 +1,4 @@
+checkoutBranch: newBranchName 
+	self withRepoDo: [ :repo |
+		repo checkout: newBranchName ].
+	self branch: self lookupHead.

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/actions/cloneRepository.st

@@ -0,0 +1,2 @@
+cloneRepository
+	self cloneRepositoryFrom: self origin