openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Peter Kovacs <Pe...@Apache.org>
Subject Re: get Revision from Git (short Hash)
Date Tue, 13 Aug 2019 17:14:05 GMT
I try to add the feature. I currently do not know how to check/retireve
the git-svn-id. Need to search for it.

On 13.08.19 16:46, Matthias Seidel wrote:
>
> Hi Peter,
>
> Am 11.08.19 um 20:36 schrieb Peter Kovacs:
>> Okay I am really out of practice with Perl.
>>
>> I fixed an error in the script. I used the wrong command to escape to
>> the shell. -.-
>>
>> please find an updated patch.
> Thanks! I am just building 4.2.0 for Windows with your patch applied.
>> On 11.08.19 19:57, Peter Kovacs wrote:
>>> Ok. I remove it.
>>>
>>> On 11.08.19 19:56, Marcus wrote:
>>>> Am 11.08.19 um 19:40 schrieb Peter Kovacs:
>>>>> I have adjusted the Function DetectRevisionId in
>>>>> main/solenv/bin/modules/SvnRevision.pm to return the short hash when
>>>>> executed in a git repository.
>>>>>
>>>>> If it is not a git repository, it will fallback to the SVN logic.
>
> One addition:
>
> If it is a Git repository it should first look for a git-svn-id. Only
> if it isn't present it should use the git hash.
>
> This way it would be possible to build older revisions from Git with
> the SVN Revision (via git-svn-id).
> Only newer revisions (after the switch to Git) would use the git hash.
>
>>>>>  The
>>>>> short hash includes a newline. I am not sure if that will make any
>>>>> trouble.
>
> Regarding the short git hash (vs. long git hash):
>
> I can live with it. But if there is something fundamentally wrong with
> using it (in our About dialog and on our download page) the Git gurus
> should speak up *now*. ;-)
>
> Regards,
>
>    Matthias
>
>>>>> I have attached the patch. Please review. I could not test a complete
>>>>> build I have some building issues. (I will send some separated mails.)
>>>>>
>>>>> Also I have not checked in because of the lacking N2N test, and since
I
>>>>> do not know what this newline does.
>>>> thanks for the piece of code. Any sideeffects need to be tested of
>>>> course.
>>>>
>>>> One problem I could image is the About dialog. Showing the Git hash
>>>> with a newline would be not suitable.
>>>>
>>>> Any other problem would be in the build system itself I thin.
>>>>
>>>> So, avoiding the newline would be great.
>>>>
>>>> Marcus
>>>>
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
>>>> For additional commands, e-mail: dev-help@openoffice.apache.org
>>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
>>> For additional commands, e-mail: dev-help@openoffice.apache.org
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
>>> For additional commands, e-mail: dev-help@openoffice.apache.org

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message