merge to master

Dale Henrichs-3 wrote

while there are 100+ commits in this merge[1], these issues were just fixed
in the last week or so:

 - Issue #244 baseline should be reloaded when referenced from a loading
configuration
 - Issue #246 baseline referral does not count as latest version
 - Issue #216 `unregister` command is useful
 - Issue #245 bleedingEdge version bypasses the version lock to bad effect
 - Issue #241 rewrite getting started docs - clarify role of `lock` command
 - Issue #238 Image should record the SHA of the git commit on load

and these issues were fixed around November:

 - Issue #215 `import:` must take a list
 - Issue #223 `onConflict:` exceptions should respond to #useExisting
#useNew
 - Issue #221 `onLock:` exception should respond to #honor and #break

and in between there were a number of fixes aimed at tODE support.

I've included the full commit log[2]

Dale

[1] https://github.com/dalehenrich/metacello-work/pull/239
[2] 43e4a8e 16 hours ago Merge branch 'dev' into issue_238
514dfd3 20 hours ago Issue #244: first cut fix
fc11f73 7 days ago can I not type...
166bb23 7 days ago Squeak does not have #trimBoth and Pharo2.0+ does not
have #withBlanksTrimmed ...
aa5b453 7 days ago re-enable full lineup and see how it flies
bcc89eb 7 days ago Issue #246: "fix" for printing caused tests failures
c333363 7 days ago Squeak does not have #trimBoth ... try
#withBlanksTrimmed and cross fingers
46727b3 7 days ago Issue #246: add tests ... fix version printing in
presence of imports
76442eb 7 days ago move another test to MCB
f6a309b 7 days ago move tests from MCA to MCB to balanace test execution
times
6c42e65 7 days ago pare down lineup and try balancing test run time a bit
faf7c49 7 days ago remove tracing
bc203ea 7 days ago update license and re-enable full lineup
3369630 7 days ago gained/lost whitespace
MetacelloToolBoxConstructorTestCase>>#'testProjectToolBoxSourceComparison*
tests
ad69c3d 7 days ago 1 down, more to go ... more tracing
fbc4bb6 7 days ago partial fix
cf52a31 7 days ago fix tracing for test errors:
20ab0a2 7 days ago Merge branch 'issue_238' of
github.com:dalehenrich/metacello-work
into issue_238
c727972 7 days ago tracing for test errors:
2248427 7 days ago ping travis and launch tests for Issue #216, Issue #223,
and Issue #245
1290593 8 days ago cut down the line up to a manageble list [ci skip]
9e476a3 8 days ago Issue #223: document useNew and useExisting [ci skip]
d5791b6 8 days ago Issue #223: replace useIncoming with useNew ...
existing/new is clearet I think
baf5b28 8 days ago Issue #216: add tests for `register` and `unregister`
commands
01fd024 8 days ago issue #245: test added
6f858e3 8 days ago add tracing for Issue #247 [ci skip]
2184945 8 days ago Issue #241 ... 3.1.0.6 removed from docs tests lineup
[ci skip]
f8a84e9 8 days ago add tests for Issue #221
1fd114a 8 days ago Merge branch 'issue_238' of
github.com:dalehenrich/metacello-work
into issue_238
7a78619 8 days ago update docs for Issue #221 ... [ci skip]
886d6e9 8 days ago restore full lineup for standard testing
086b530 8 days ago use the correct invocation of the success no failure
block
27176ab 8 days ago use builderCI mechanism to report success
2cdf659 8 days ago userGuide.st should be successful when it completes with
no erros ... drop success file at end ... pare down the lineup to only the
userGuide test
b137264 8 days ago Issue #245: fix looks good ... need to handle printing
ov versionString when it is nil..
2bdf8d8 8 days ago proposed fix for Issue #245
c88ccc5 2 weeks ago tODE Issue dalehenrich/tode#79: turns out that when
handling MetacelloIgnorePackageLoaded, you really want to have the
monticello version (file field) if it is available
26240db 3 weeks ago add .gitattributes
df3df71 3 weeks ago with fix of dalehenrich/builderCI#55, re-enable squeak
platform
98de53e 3 weeks ago persist .gitattributes
8f9918c 3 weeks ago Pharo2.0 bugfix looks good ... restore full lineup
inprepartion for merge into master
d1cc986 3 weeks ago restrict lineup to Pharo2.0 and GemStone 3.2 to test a
Pharo2.0-specific fix
667a7b6 3 weeks ago should be using MCFileTreeFileUtils current for file
manipulation
6eb9368 3 weeks ago re-enable full lineup (pharo3.0 and all Squeak
platforms excluded, because they are failing for reasons that have nothing
to do with Metacello ... failures due to hangs - Squeak - or systemic test
failures - Pharo3.0 - render running the tests on those platforms
meaningless)
f59b8bc 3 weeks ago see if not locking Seaside30 does the trick ..
elsewise, just bag the whole user guide test ... the docs need to be redone
for locking anyway ...
9b1e1e3 3 weeks ago more monkey business with the user guide and tests ...
29e7d90 3 weeks ago premature enablement of full lineup ... green in small
lineup first:)
03422fd 3 weeks ago restore the full lineup as I prepare to merge into
master
08d1072 3 weeks ago tweak a test
6c68064 4 weeks ago fix comment and trim blanks in
MetacelloGemStonePlatform>>gitRootDirectoryPath:
82a8fc9 4 weeks ago should be legal to register an unloaded project
32c2931 4 weeks ago extra SHA from directory path for github repositories
and use the projectVersion as the branch name
59b8e6f 4 weeks ago add increment/decrement Major/Minor/Patch version
numbers for both MetacelloSemanticVersionNumber and MetacelloVersionNumber
812d852 5 weeks ago Wow!
4fbcf07 5 weeks ago for configurations, currentBranchName returns version
blessing ...
69f90ca 5 weeks ago add `register` command ...
085e823 5 weeks ago add more git support to MetacelloGemStonePlatform
c082697 5 weeks ago add a useful git utility function to
MetacelloGemStonePlatform
a059e60 5 weeks ago even more "project revert" work
176510d 5 weeks ago more "project revert" work
e330bf2 5 weeks ago implement "project revert" feature.
fe11800 5 weeks ago finish work on unregistering removed
configuration/baseline classes
0c774ea 5 weeks ago hook up MetacelloProjectRegistration for class removal
events
c787b6e 6 weeks ago - test clean up ...
MetacelloScriptingFetchRecordTestCase>>testBasicFetch001 was randomly
failing ... should be fixed now - baseline can be loaded on top of a
configuration without a conflict ... fix
MetacelloMCBaselineOfProjectSpec>>hasConflictWithConfigurationSpec:
a56acbd 6 weeks ago - restoring some more behavior that was lost during the
merge ... trying to correct incorrect load situration where a baseline is
loaded into image (and therefore should become the primary registration)
not only does it not become the primary, but an invalid registration is
created to boot! - once I get my current load problem corrected, run tests
... hopefully some will fail:)
da8ec87 6 weeks ago scale back lineup for quick test turnaround
0c05b25 6 weeks ago - inline MetacelloProjectRegistration>>isValid to
correct invalid definition ... detecting INVALID registrations
1b95b78 6 weeks ago A MetacelloProjectRegistration CANNOT have both a
Configuration and a Baseline registered. The registration reflects the
loaded state of the image and that means that if a baseline was used to
load the project then the baseline reflects loaded state. If a
configuration was used to load the project then the configuration reflects
loaded state ... If a configuration was used to load a baseline, then
heaven help you:) for the moment...
711167e 6 weeks ago - horrible hack (continued) to get around potential
load issues when MetacelloProjectRegistry>>registerProjectRegistration:
gets installed before MetacelloProjectRegistration>>versionInfo - remove
the previous horrible hack and cross fingers... - now that I think a bit,
this isn't quite the horrible hack it seems ... the load is performed using
GsDeployer class>>bulkMigrate: ... so old class versions are to be expected
.... so change that to horrible, justifiable hack ...
9d4d936 6 weeks ago - horrible hack to get around potential load issues
when MetacelloProjectRegistration>>merge: gets installed before
MetacelloProjectRegistration>>versionInfo
a5b40d2 6 weeks ago - add api for getting git branch name from repo ...
c5dca2a 6 weeks ago Seaside30 #stable is not ported to GemStone 3.2 ... use
3.1.0.6 instead
298181c 6 weeks ago fix up MCRepository>>repositoryVersionString ... get
tests to pass
01de82a 6 weeks ago - a little project registration love...
63b934a 6 weeks ago - a little project registration love...
76b3f6e 6 weeks ago add GemStone-3.2.0 and Squeak-Trunk to lineup
2c52ace 6 weeks ago - add Metacello-GS2x-Platform for GemStone 2.x specific
code - support for MetacelloProjectRegistrationVersionInfo which should
allow us to associate the git commit SHA for a git repo with the baseline
that was loaded from the repo - all repository types supported for
displaying something useful for the version string (only used by baselines
as configuration version is used for configurations) - tests
41a0169 6 weeks ago - Issue #43: prime registry from image now allows for
choice of favoring baselines or configurations ... baseline is default
which is right answer since priming from image is only necessary during
certain bootstrapping operations for Metacello itself
4306ddd 6 weeks ago restore sanity to version numbers for a coupld of
packages that lost their version numbers during merge
23cd57d 6 weeks ago - Restore some methods deleted during last merge, that
still should probably be kept around ... - fix a problem related to Issue
#43 ... when priming registry and Configuration is encountered for which
there is a baseline registration ... skip it ...
9e1ca0c 6 weeks ago Merge branch 'master' into issue_238
62b298f 6 weeks ago add .gitatributes for automatic merging of monticello
version files ... keep local this .gitignore entry
5e61a3c 6 weeks ago Merge pull request #235 from
seandenigris/update-readme-pharo30
f0aec19 6 weeks ago tweak travis lineup, add .gitignore
5c16a7e 8 weeks ago Fix typo
b8412ea 8 weeks ago Update Pharo installation instructions
1f5ec92 8 weeks ago Note that we're pre-installed in Pharo 3.0
e47901f 6 months ago To correctly read files, it is necessary to use
FileDirectory>>readOnlyFileNamed:do:
4e8b9cd 7 months ago Issue #215: add tests cases and fix a minor bug (which
is why tests cases are important)
92faa93 7 months ago Issue #223: implement
MetacelloResolveProjectUpgrade>>useIncoming to repolace
MetacelloResolveProjectUpgrade>>useNew
2d71268 7 months ago Issue #223: implement
MetacelloResolveProjectUpgrade>>useNew and
MetacelloResolveProjectUpgrade>>useExisting
f962d21 7 months ago checkpoint [ci skip]
92d8be5 7 months ago checkpoint [ci skip]
e226fb0 7 months ago checkpoint [ci skip]
27b4042 7 months ago checkpoint [ci skip]
fdb3c32 7 months ago checkpoint [ci skip]
c268e08 7 months ago checkpoint [ci skip]
1870a05 7 months ago checkpoint [ci skip]
8be06dd 7 months ago checkpoint [ci skip]
2017928 7 months ago checkpoint [ci skip]
dfc535b 7 months ago removed LockingTutorial.md [ci skip]
83672bf 7 months ago checkpoint .. renamed LockingTutorial.md to
LockCommandReference.md [ci skip]
8cb641d 7 months ago first draft complete [ci skip]
fed3b30 7 months ago Merge branch 'issue_215' of
github.com:dalehenrich/metacello-work
into issue_215
a54d4d6 7 months ago Merge branch 'issue_215' of
github.com:dalehenrich/metacello-work
into issue_215
f56251c 7 months ago Issue #221: implement
MetacelloAllowLockedProjectChange>>break and
MetacelloAllowLockedProjectChange>>honor. Issue #222: suggested bugfix
implemented Issue #215: additional tweak
0b4b841 7 months ago docs checkpoint [ci skip]
f2c8a2b 7 months ago checkpoint docs ... update license [ci skip]
d26a263 7 months ago checkpoint [ci skip]
eac0371 7 months ago doc checkpoint [ci skip]
0dbe956 7 months ago checkpoint docs update ... expanding lock example [ci
skip]
28316a2 7 months ago start writeup on locking example for Otto
96e07b1 7 months ago Merge pull request #217 from finworks/master
e89fcbb 7 months ago removed assertion on setting project - class version
problem
748bb3d 7 months ago fix registration tests
7650e61 7 months ago renaming of MetacelloMCProjectSpec seem to cause
problems. Reverted
35b004c 7 months ago Make concrete MetacelloMCProjectSpec. More code can
move to it as it should take lowest precedence when merging.
bd7294e 7 months ago make MetacelloMCProjectSpec abstract
fa8b2a9 7 months ago Issue #215: fix a bug in
MetacelloMCVersionSpec>>packageSpecsInLoadOrderForMap:
1d26db1 7 months ago Issue #215: fix a bug in
MetacelloVersionSpec>>packageNamed:forLoad:forMap:ifAbsent:
0885bac 7 months ago turns out that having an unregister command to deal
with unloaded projects is convenient...
d4f71e7 7 months ago MetacelloMCProjectSpec is not abstract, o dear
3310e15 7 months ago refactored MetacelloProjectRegistration towards Config
& Baseline specs doing the work. Changed lookupSpec: to use baseName so it
can find whats already loaded
6d351d2 7 months ago Issue #215: add #import:provides: to allow for imports
from multiple projects and multiple imports from a single project ... might
need one more layer of mapping, but this will work for now ... see
https://github.com/dalehenrich/example/tree/otto

--
You received this message because you are subscribed to the Google Groups "Metacello" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/d/optout.