Code Changes [Was [resolution] svn migration plan]

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

Code Changes [Was [resolution] svn migration plan]

Mechtilde Stehmann-2
Hello,

I looked into

main/solenv/bin/modules/SvnRevision.pm:39

There we have to change the condition for the "Revision ID"

Instead of the condition for the git-svn-id we should take the hash
which followed to the word "commit" in the first line.

Here is an ouput with git show HEAD from last commit in AOO42X

1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
origin/AOO42X)
2. Author: Matthias Seidel <[hidden email]>
3. Date:   Fri Aug 2 18:45:56 2019 +0000
4.
5.    Merged r1864263 from trunk
6.
7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
8.
9.    git-svn-id:
https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
13f79535-47bb-0310-9956-ffa450edef68

I added the line numbers for better reading.

Can someone wrote the right Regular Expression in Perl.

Kind regards

--
Mechtilde Stehmann
## Apache OpenOffice
## Freie Office Suite für Linux, MacOSX, Windows
## Debian Developer
## PGP encryption welcome
## F0E3 7F3D C87A 4998 2899  39E7 F287 7BBA 141A AD7F


signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Matthias Seidel
Hi Mechtilde,

Am 03.08.19 um 13:56 schrieb Mechtilde:

> Hello,
>
> I looked into
>
> main/solenv/bin/modules/SvnRevision.pm:39
>
> There we have to change the condition for the "Revision ID"
>
> Instead of the condition for the git-svn-id we should take the hash
> which followed to the word "commit" in the first line.
>
> Here is an ouput with git show HEAD from last commit in AOO42X
>
> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
> origin/AOO42X)
> 2. Author: Matthias Seidel <[hidden email]>
> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
> 4.
> 5.    Merged r1864263 from trunk
> 6.
> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
> 8.
> 9.    git-svn-id:
> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
> 13f79535-47bb-0310-9956-ffa450edef68
Only to clarify:

This commit still contains the git-svn-id.
Newer commits will not have it, so the revision in our About dialog will
stay blank.
(I am just doing a build to clarify)

Regards,

   Matthias

>
> I added the line numbers for better reading.
>
> Can someone wrote the right Regular Expression in Perl.
>
> Kind regards
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Matthias Seidel
Hi all,

Any progress?

Git is active since Saturday.
SVN is now read only (for trunk, branches and tags).

New Builds do not contain any revision information.

We have documentation that must be updated asap, e.g.:
https://openoffice.apache.org/source.html

Who wants to write a blog post or post *any* kind of information for the
public?

It remains a mystery  for me why this hasn't been discussed and planned
prior to the switch...

Regards,

   Matthias

Am 03.08.19 um 14:09 schrieb Matthias Seidel:

> Hi Mechtilde,
>
> Am 03.08.19 um 13:56 schrieb Mechtilde:
>> Hello,
>>
>> I looked into
>>
>> main/solenv/bin/modules/SvnRevision.pm:39
>>
>> There we have to change the condition for the "Revision ID"
>>
>> Instead of the condition for the git-svn-id we should take the hash
>> which followed to the word "commit" in the first line.
>>
>> Here is an ouput with git show HEAD from last commit in AOO42X
>>
>> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
>> origin/AOO42X)
>> 2. Author: Matthias Seidel <[hidden email]>
>> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
>> 4.
>> 5.    Merged r1864263 from trunk
>> 6.
>> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
>> 8.
>> 9.    git-svn-id:
>> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
>> 13f79535-47bb-0310-9956-ffa450edef68
> Only to clarify:
>
> This commit still contains the git-svn-id.
> Newer commits will not have it, so the revision in our About dialog will
> stay blank.
> (I am just doing a build to clarify)
>
> Regards,
>
>    Matthias
>
>> I added the line numbers for better reading.
>>
>> Can someone wrote the right Regular Expression in Perl.
>>
>> Kind regards
>>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Matthias Seidel
In reply to this post by Mechtilde Stehmann-2
Hi Mechtilde,

Am 03.08.19 um 13:56 schrieb Mechtilde:
> Hello,
>
> I looked into
>
> main/solenv/bin/modules/SvnRevision.pm:39
>
> There we have to change the condition for the "Revision ID"

We should not change it but rather expand the logic.

This way builds before the "git switch" would still take the git-svn-id
and builds after would take the git hash.

>
> Instead of the condition for the git-svn-id we should take the hash
> which followed to the word "commit" in the first line.
>
> Here is an ouput with git show HEAD from last commit in AOO42X
>
> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
> origin/AOO42X)
> 2. Author: Matthias Seidel <[hidden email]>
> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
> 4.
> 5.    Merged r1864263 from trunk
> 6.
> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
> 8.
> 9.    git-svn-id:
> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
> 13f79535-47bb-0310-9956-ffa450edef68
>
> I added the line numbers for better reading.
>
> Can someone wrote the right Regular Expression in Perl.
If I knew how to do it, it would be already done... ;-)

Regards,

   Matthias

>
> Kind regards
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Peter Kovacs-3
In reply to this post by Mechtilde Stehmann-2
following commandline returns the short hash of the current revision

|git log -1 --pretty=format:%h So the code should work like this: sub
DetectRevisionIdFromGit ($) { my $path = shift; my $id = undef; open my
$proc, "cd $path && git log -1 --pretty=format:%h 2>\&1|"; while
(<$proc>) { if (/^fatal: Not a git repository/) { # Not in a GIT
repository. last; } else { $id = $proc; last; } } close $proc; return
$id; } I think you guys are faster in testing. |

On 03.08.19 13:56, Mechtilde wrote:

> Hello,
>
> I looked into
>
> main/solenv/bin/modules/SvnRevision.pm:39
>
> There we have to change the condition for the "Revision ID"
>
> Instead of the condition for the git-svn-id we should take the hash
> which followed to the word "commit" in the first line.
>
> Here is an ouput with git show HEAD from last commit in AOO42X
>
> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
> origin/AOO42X)
> 2. Author: Matthias Seidel <[hidden email]>
> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
> 4.
> 5.    Merged r1864263 from trunk
> 6.
> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
> 8.
> 9.    git-svn-id:
> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
> 13f79535-47bb-0310-9956-ffa450edef68
>
> I added the line numbers for better reading.
>
> Can someone wrote the right Regular Expression in Perl.
>
> Kind regards
>
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Matthias Seidel
Hi Peter,

Am 08.08.19 um 22:06 schrieb Peter Kovacs:
> following commandline returns the short hash of the current revision
>
> |git log -1 --pretty=format:%h So the code should work like this: sub
> DetectRevisionIdFromGit ($) { my $path = shift; my $id = undef; open my
> $proc, "cd $path && git log -1 --pretty=format:%h 2>\&1|"; while
> (<$proc>) { if (/^fatal: Not a git repository/) { # Not in a GIT
> repository. last; } else { $id = $proc; last; } } close $proc; return
> $id; } I think you guys are faster in testing. |

What should I do with that? ;-)

And just FYI: Mechtilde is preparing for the FrOSCon this weekend, she
will not be available until next week.

Matthias

>
> On 03.08.19 13:56, Mechtilde wrote:
>> Hello,
>>
>> I looked into
>>
>> main/solenv/bin/modules/SvnRevision.pm:39
>>
>> There we have to change the condition for the "Revision ID"
>>
>> Instead of the condition for the git-svn-id we should take the hash
>> which followed to the word "commit" in the first line.
>>
>> Here is an ouput with git show HEAD from last commit in AOO42X
>>
>> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
>> origin/AOO42X)
>> 2. Author: Matthias Seidel <[hidden email]>
>> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
>> 4.
>> 5.    Merged r1864263 from trunk
>> 6.
>> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
>> 8.
>> 9.    git-svn-id:
>> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
>> 13f79535-47bb-0310-9956-ffa450edef68
>>
>> I added the line numbers for better reading.
>>
>> Can someone wrote the right Regular Expression in Perl.
>>
>> Kind regards
>>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Matthias Seidel
In reply to this post by Matthias Seidel
Hi,

For the specific guy that told me I didn't speak up.

This is still unresponded...

Matthias

Am 06.08.19 um 11:48 schrieb Matthias Seidel:

> Hi all,
>
> Any progress?
>
> Git is active since Saturday.
> SVN is now read only (for trunk, branches and tags).
>
> New Builds do not contain any revision information.
>
> We have documentation that must be updated asap, e.g.:
> https://openoffice.apache.org/source.html
>
> Who wants to write a blog post or post *any* kind of information for the
> public?
>
> It remains a mystery  for me why this hasn't been discussed and planned
> prior to the switch...
>
> Regards,
>
>    Matthias
>
> Am 03.08.19 um 14:09 schrieb Matthias Seidel:
>> Hi Mechtilde,
>>
>> Am 03.08.19 um 13:56 schrieb Mechtilde:
>>> Hello,
>>>
>>> I looked into
>>>
>>> main/solenv/bin/modules/SvnRevision.pm:39
>>>
>>> There we have to change the condition for the "Revision ID"
>>>
>>> Instead of the condition for the git-svn-id we should take the hash
>>> which followed to the word "commit" in the first line.
>>>
>>> Here is an ouput with git show HEAD from last commit in AOO42X
>>>
>>> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
>>> origin/AOO42X)
>>> 2. Author: Matthias Seidel <[hidden email]>
>>> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
>>> 4.
>>> 5.    Merged r1864263 from trunk
>>> 6.
>>> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
>>> 8.
>>> 9.    git-svn-id:
>>> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
>>> 13f79535-47bb-0310-9956-ffa450edef68
>> Only to clarify:
>>
>> This commit still contains the git-svn-id.
>> Newer commits will not have it, so the revision in our About dialog will
>> stay blank.
>> (I am just doing a build to clarify)
>>
>> Regards,
>>
>>    Matthias
>>
>>> I added the line numbers for better reading.
>>>
>>> Can someone wrote the right Regular Expression in Perl.
>>>
>>> Kind regards
>>>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Code Changes [Was [resolution] svn migration plan]

Peter Kovacs-3
The specific guy wrote a todo list. You may say that I am the one who
pisses you off. You may say so, that is okay. I do that currently with
my acting before planning style.

I have created a todo list here.

https://cwiki.apache.org/confluence/display/OOOUSERS/Git+migration

I think I have added your all your points. please check.

If I remember right I said that documentation is an issue to be dealt
with. So I did respond to your points. Maybe it was not the answer that
you wanted to hear.

Also I am on the Revision ID thing. I already posted an approach. You
were the only one who did look at it and it did not help you.

I am testing it, then I send in a patch.

I will not write a blog post, I ave tried multiple times. And so far the
only reaction I got have been negative.


I am doing my best. I am sorry that it is not good for you.

On 11.08.19 12:49, Matthias Seidel wrote:

> Hi,
>
> For the specific guy that told me I didn't speak up.
>
> This is still unresponded...
>
> Matthias
>
> Am 06.08.19 um 11:48 schrieb Matthias Seidel:
>> Hi all,
>>
>> Any progress?
>>
>> Git is active since Saturday.
>> SVN is now read only (for trunk, branches and tags).
>>
>> New Builds do not contain any revision information.
>>
>> We have documentation that must be updated asap, e.g.:
>> https://openoffice.apache.org/source.html
>>
>> Who wants to write a blog post or post *any* kind of information for the
>> public?
>>
>> It remains a mystery  for me why this hasn't been discussed and planned
>> prior to the switch...
>>
>> Regards,
>>
>>    Matthias
>>
>> Am 03.08.19 um 14:09 schrieb Matthias Seidel:
>>> Hi Mechtilde,
>>>
>>> Am 03.08.19 um 13:56 schrieb Mechtilde:
>>>> Hello,
>>>>
>>>> I looked into
>>>>
>>>> main/solenv/bin/modules/SvnRevision.pm:39
>>>>
>>>> There we have to change the condition for the "Revision ID"
>>>>
>>>> Instead of the condition for the git-svn-id we should take the hash
>>>> which followed to the word "commit" in the first line.
>>>>
>>>> Here is an ouput with git show HEAD from last commit in AOO42X
>>>>
>>>> 1. commit 7b7ead25a5e14edc410cfd3b24d145ab38514b11 (HEAD -> AOO42X,
>>>> origin/AOO42X)
>>>> 2. Author: Matthias Seidel <[hidden email]>
>>>> 3. Date:   Fri Aug 2 18:45:56 2019 +0000
>>>> 4.
>>>> 5.    Merged r1864263 from trunk
>>>> 6.
>>>> 7.    Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
>>>> 8.
>>>> 9.    git-svn-id:
>>>> https://svn.apache.org/repos/asf/openoffice/branches/AOO42X@1864280
>>>> 13f79535-47bb-0310-9956-ffa450edef68
>>> Only to clarify:
>>>
>>> This commit still contains the git-svn-id.
>>> Newer commits will not have it, so the revision in our About dialog will
>>> stay blank.
>>> (I am just doing a build to clarify)
>>>
>>> Regards,
>>>
>>>    Matthias
>>>
>>>> I added the line numbers for better reading.
>>>>
>>>> Can someone wrote the right Regular Expression in Perl.
>>>>
>>>> Kind regards
>>>>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]