Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Even better detect of possible referenceCommit #514

Merged
merged 2 commits into from
Nov 12, 2017
Merged

Even better detect of possible referenceCommit #514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d76da1
Trying to do more in order to detect the best version. If there are m…
noha Nov 11, 2017
b12ae9b
After we sorted the anchestry we need to take the first element inste…
noha Nov 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions Iceberg.package/IceLoadedCode.class/instance/computeReferenceCommit.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,33 @@ computeReferenceCommit
"2. Happy path: see if all loaded code has the same updation commit.
If we can't compute an updation commit for some loaded code, it means that it has been
probably loaded from another kind of repository, we just ignore it."

candidates := (self loadedVersions collect: [:version | version commit] as: Set) reject: #isNil.
candidates size = 1 ifTrue: [
(candidates size = 1) ifTrue: [ | sorted |
sorted := candidates sorted: [ :a :b | a parents includes: b ].
"If there is no newer commit for this repository until the loaded one we use the
head commit instead. This covers the case where commits external to pharo happened
since last time the package was loaded"
^ (repository headCommit changedPackagesTo: candidates anyOne)
ifNotEmpty: [ candidates anyOne ]
ifEmpty: [ repository headCommit ] ].
ifEmpty: [ repository headCommit ] ].

"If there are more than one versions as candidates try to bring them in anchestry order.
If all are consistent in the anchestry chain then the first element is the most actual"
(candidates size > 1) ifTrue: [ | consistent |
"sort by anchestry"
consistent := true.
"check if all versions are related"
candidates := candidates sorted: [ :a :b | a parents includes: b ].
candidates pairsDo: [ :a :b |
(a parents includes: b) ifFalse: [ consistent := false ] ].
consistent ifTrue: [
^ (repository headCommit changedPackagesTo: candidates first)
ifNotEmpty: [ candidates first ]
ifEmpty: [ repository headCommit ] ] ] .

"3. None of the loaded versions produced a non nil candidate, just use the HEAD commit"
candidates isEmpty ifTrue: [ ^ self repository headCommit ].

"4. We could try other strategies... but this should be good for now."
^ candidates detectMax: #datetime
^ candidates detectMax: #datetime