Repository navigation
Sync Zinc with svenvc/zinc, within the bootstrap's stages - #20203
Merged
jecisc merged 2 commits intoNov 11, 2026
Merged
Conversation
Takes the options, the encoder diagnostics, IRI support, certificate verification and the small additions upstream has gained since Pharo's copy forked. Leaves the server rework, the demo-site rework and the network-test harness behind. The accessors the new options supersede move to Deprecated15, and upstream's #asUrl call sites become #asZnUrl, which Pharo did not deprecate. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The sync made the kernel's Zinc-Character-Encoding-Core refer to ZnCurrentOptions and extend SocketStream, both loaded later, called a size printer Pharo does not have from the code that downloads the image's dependencies, and put a test needing Zinc-HTTP back into the encoding tests. The percent encoder now carries the IRI choice, which Zinc-Resource-Meta-Core sets from the option; the SocketStream extensions move to Zinc-HTTP; humanReadableSISizeString and ZnEncoderFromUrlTest stay. ZnOptions re-initializes on load, and ZnLogEvent no longer sends a deprecated conversion. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Member
|
Tx gabriel! |
jecisc
approved these changes
Nov 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-lands #20131, reverted by #20143 because the bootstrap failed. That PR's description says what the sync brings; the first commit is it unchanged.
The second commit restores what Pharo had adapted to load Zinc in stages: the kernel takes Zinc-Character-Encoding-Core, the
RemoteRepositoriesgroup of BaselineOfMonticello takes Zinc-Resource-Meta-Core and Zinc-HTTP, and the IDE install downloads the rest of Pharo through them.ZnPercentEncoder >> #urlAsIrireadZnCurrentOptions, which is not in the kernel, so the bootstrap stopped on an undeclared variable. The encoder now carries the choice, set from the option by Zinc-Resource-Meta-Core.String >> #urlEncodedno longer follows#urlAsIri.SocketStreamextensions move from Zinc-Character-Encoding-Core to Zinc-HTTP, since Network-Kernel is not in the kernel either.ZnUtils class >> #signalProgress:total:goes back to#humanReadableSISizeString: Pharo has no#humanReadableSIByteSizeon numbers, and the IDE install failed downloading its dependencies.testByteEncoderFromUrlleavesZnCharacterEncoderTestagain: it needs Zinc-HTTP, andZnEncoderFromUrlTestalready has it.ZnOptions class >> #initializetakes upstream's marker comment, so loading this resets the default options to include the new ones.ZnLogEvent class >> #printAddress:on:usesSocketAddress class >> #fromOldByteAddress:instead of the deprecatedByteArray >> #asSocketAddress.The cycle between the two packages is upstream's too: svenvc/zinc#167.