Smalltalk › Squeak › Squeak - Dev

The Trunk: Multilingual-pre.221.mcz

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

5 messages Options

commits-2

The Trunk: Multilingual-pre.221.mcz

Patrick Rein uploaded a new version of Multilingual to project The Trunk:
http://source.squeak.org/trunk/Multilingual-pre.221.mcz

==================== Summary ====================

Name: Multilingual-pre.221
Author: pre
Time: 21 April 2017, 8:33:21.048887 am
UUID: 30e94580-da2e-2f4a-9b30-a18641b2b26b
Ancestors: Multilingual-pre.219

Fixed the initialization method in ByteTextConverter.
Refactored the initialize of TextConverter classes as they all had the exact same source.
Fixed the comment of the CP1252 converter

=============== Diff against Multilingual-pre.219 ===============

Item was added:
+ ----- Method: ByteTextConverter class>>initialize (in category 'class initialization') -----
+ initialize
+
+ self ~~ ByteTextConverter ifTrue: "This method exists for subclass use"
+ [self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings]
+ !

Item was removed:
- ----- Method: CP1250TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was changed:
ByteTextConverter subclass: #CP1252TextConverter
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Multilingual-TextConversion'!

+ !CP1252TextConverter commentStamp: 'pre 4/20/2017 11:40' prior: 0!
+ Text converter for CP1252. Windows code page used in Western Europe.!
- !CP1252TextConverter commentStamp: '<historical>' prior: 0!
- Text converter for CP1250. Windows code page used in Eastern Europe.!

Item was removed:
- ----- Method: CP1252TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was removed:
- ----- Method: CP1253TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was removed:
- ----- Method: ISO88592TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was removed:
- ----- Method: ISO88597TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was removed:
- ----- Method: Latin1TextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Item was removed:
- ----- Method: MacRomanTextConverter class>>initialize (in category 'class initialization') -----
- initialize
- self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Levente Uzonyi

Re: The Trunk: Multilingual-pre.221.mcz

So, now we have another problem. This package has Multilingual-pre.219 as
ancestor, so the image will try to merge it with Multilingual-pre.220. I
suggest you commit another version with the two packages merged (even if
that means rejecting all changes of Multilingual-pre.220).

Levente

On Fri, 21 Apr 2017, [hidden email] wrote:

> Patrick Rein uploaded a new version of Multilingual to project The Trunk:
> http://source.squeak.org/trunk/Multilingual-pre.221.mcz
>
> ==================== Summary ====================
>
> Name: Multilingual-pre.221
> Author: pre
> Time: 21 April 2017, 8:33:21.048887 am
> UUID: 30e94580-da2e-2f4a-9b30-a18641b2b26b
> Ancestors: Multilingual-pre.219
>
> Fixed the initialization method in ByteTextConverter.
> Refactored the initialize of TextConverter classes as they all had the exact same source.
> Fixed the comment of the CP1252 converter
>
> =============== Diff against Multilingual-pre.219 ===============
>
> Item was added:
> + ----- Method: ByteTextConverter class>>initialize (in category 'class initialization') -----
> + initialize
> +
> + self ~~ ByteTextConverter ifTrue: "This method exists for subclass use"
> + [self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings]
> + !
>
> Item was removed:
> - ----- Method: CP1250TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was changed:
> ByteTextConverter subclass: #CP1252TextConverter
> instanceVariableNames: ''
> classVariableNames: ''
> poolDictionaries: ''
> category: 'Multilingual-TextConversion'!
>
> + !CP1252TextConverter commentStamp: 'pre 4/20/2017 11:40' prior: 0!
> + Text converter for CP1252. Windows code page used in Western Europe.!
> - !CP1252TextConverter commentStamp: '<historical>' prior: 0!
> - Text converter for CP1250. Windows code page used in Eastern Europe.!
>
> Item was removed:
> - ----- Method: CP1252TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was removed:
> - ----- Method: CP1253TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was removed:
> - ----- Method: ISO88592TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was removed:
> - ----- Method: ISO88597TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was removed:
> - ----- Method: Latin1TextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>
> Item was removed:
> - ----- Method: MacRomanTextConverter class>>initialize (in category 'class initialization') -----
> - initialize
> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Patrick R.

Re: The Trunk: Multilingual-pre.221.mcz

I added a merge commit... How could I have avoided that upfront?
I thought that simply adding a new commit would not have helped
as the update process would still have loaded the broken version.

Bests,
Patrick
________________________________________
From: Squeak-dev <[hidden email]> on behalf of Levente Uzonyi <[hidden email]>
Sent: Friday, April 21, 2017 09:11
To: [hidden email]
Cc: [hidden email]
Subject: Re: [squeak-dev] The Trunk: Multilingual-pre.221.mcz

So, now we have another problem. This package has Multilingual-pre.219 as
ancestor, so the image will try to merge it with Multilingual-pre.220. I
suggest you commit another version with the two packages merged (even if
that means rejecting all changes of Multilingual-pre.220).

Levente

On Fri, 21 Apr 2017, [hidden email] wrote:

Levente Uzonyi

Re: The Trunk: Multilingual-pre.221.mcz

On Fri, 21 Apr 2017, Rein, Patrick wrote:

> I added a merge commit... How could I have avoided that upfront?

What do you mean by merge commit?

> I thought that simply adding a new commit would not have helped
> as the update process would still have loaded the broken version.

It would have worked perfectly, because the update process won't load each
and every version but only those declared in .mcd files and the latest
ones.

Currently the Multilingual package in the Trunk has two head versions:
Multilingual-pre.220 and Multilingual-pre.221. Both of them have
Multilingual-pre.219 as their ancestor.
If you update your image, you'll see the dialog where the update process
will try to load both. Actually, I expect it to load Multilingual-pre.220
first (because it has the smaller version number), pop up the debugger,
and if you proceed manually, you'll see the merge dialog, where it will
try to merge Multilingual-pre.221.
The solution is to commit a new version having both Multilingual-pre.220
and Multilingual-pre.221 as ancestors.

Levente

>
> Bests,
> Patrick
> ________________________________________
> From: Squeak-dev <[hidden email]> on behalf of Levente Uzonyi <[hidden email]>
> Sent: Friday, April 21, 2017 09:11
> To: [hidden email]
> Cc: [hidden email]
> Subject: Re: [squeak-dev] The Trunk: Multilingual-pre.221.mcz
>
> So, now we have another problem. This package has Multilingual-pre.219 as
> ancestor, so the image will try to merge it with Multilingual-pre.220. I
> suggest you commit another version with the two packages merged (even if
> that means rejecting all changes of Multilingual-pre.220).
>
> Levente
>
> On Fri, 21 Apr 2017, [hidden email] wrote:
>
>> Patrick Rein uploaded a new version of Multilingual to project The Trunk:
>> http://source.squeak.org/trunk/Multilingual-pre.221.mcz
>>
>> ==================== Summary ====================
>>
>> Name: Multilingual-pre.221
>> Author: pre
>> Time: 21 April 2017, 8:33:21.048887 am
>> UUID: 30e94580-da2e-2f4a-9b30-a18641b2b26b
>> Ancestors: Multilingual-pre.219
>>
>> Fixed the initialization method in ByteTextConverter.
>> Refactored the initialize of TextConverter classes as they all had the exact same source.
>> Fixed the comment of the CP1252 converter
>>
>> =============== Diff against Multilingual-pre.219 ===============
>>
>> Item was added:
>> + ----- Method: ByteTextConverter class>>initialize (in category 'class initialization') -----
>> + initialize
>> +
>> + self ~~ ByteTextConverter ifTrue: "This method exists for subclass use"
>> + [self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings]
>> + !
>>
>> Item was removed:
>> - ----- Method: CP1250TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was changed:
>> ByteTextConverter subclass: #CP1252TextConverter
>> instanceVariableNames: ''
>> classVariableNames: ''
>> poolDictionaries: ''
>> category: 'Multilingual-TextConversion'!
>>
>> + !CP1252TextConverter commentStamp: 'pre 4/20/2017 11:40' prior: 0!
>> + Text converter for CP1252. Windows code page used in Western Europe.!
>> - !CP1252TextConverter commentStamp: '<historical>' prior: 0!
>> - Text converter for CP1250. Windows code page used in Eastern Europe.!
>>
>> Item was removed:
>> - ----- Method: CP1252TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was removed:
>> - ----- Method: CP1253TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was removed:
>> - ----- Method: ISO88592TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was removed:
>> - ----- Method: ISO88597TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was removed:
>> - ----- Method: Latin1TextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!
>>
>> Item was removed:
>> - ----- Method: MacRomanTextConverter class>>initialize (in category 'class initialization') -----
>> - initialize
>> - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

Patrick R.

Re: The Trunk: Multilingual-pre.221.mcz

Thanks for explaining!

With merge commit, I referred to a commit with two ancestors. :)
I borrowed that term from git vocabulary.

The new commit is Multilingual-pre.222.mcz.
I wonder though why it does not show up in the commits emails.

Bests,
Patrick
________________________________________
From: Squeak-dev <[hidden email]> on behalf of Levente Uzonyi <[hidden email]>
Sent: Friday, April 21, 2017 09:41
To: The general-purpose Squeak developers list
Cc: [hidden email]
Subject: Re: [squeak-dev] The Trunk: Multilingual-pre.221.mcz

On Fri, 21 Apr 2017, Rein, Patrick wrote:

> I added a merge commit... How could I have avoided that upfront?

What do you mean by merge commit?

> I thought that simply adding a new commit would not have helped
> as the update process would still have loaded the broken version.

It would have worked perfectly, because the update process won't load each
and every version but only those declared in .mcd files and the latest
ones.

Currently the Multilingual package in the Trunk has two head versions:
Multilingual-pre.220 and Multilingual-pre.221. Both of them have
Multilingual-pre.219 as their ancestor.
If you update your image, you'll see the dialog where the update process
will try to load both. Actually, I expect it to load Multilingual-pre.220
first (because it has the smaller version number), pop up the debugger,
and if you proceed manually, you'll see the merge dialog, where it will
try to merge Multilingual-pre.221.
The solution is to commit a new version having both Multilingual-pre.220
and Multilingual-pre.221 as ancestors.

Levente