Document Foundation Mail Archive › LibreOffice › Dev

[ANN] Referencing bugs in commits

Classic

List

Threaded

18 messages Options

Jan Holesovsky

[ANN] Referencing bugs in commits

Hi,

Markus has implemented a nice feature that should help keeping the bugs
up to date: whenever you are committing / pushing to git, and you
reference the bugs.freedesktop.org bug in the commit message, it will
automatically appear as a comment in the bug :-)

The bug reference has to have fdo#ABCDE form (where ABCDE is the bug
number), and has to be at the first line of the commit (it does not
matter where on that line). So eg. when you write git commit log as:

----- 8< -----
fdo#45748: Don't use empty pages for computing the page break position
----- 8< -----

It will result in the following comment in bugzilla:

https://bugs.freedesktop.org/show_bug.cgi?id=45748#c7

I am sorry for the trouble with the UTF-8 encoding, we'll fix that
later. Also, the comments are so far created with my bugzilla account,
we'll switch to a bug alias soon.

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Michael Meeks-2

Re: [ANN] Referencing bugs in commits

On Tue, 2012-02-14 at 16:16 +0100, Jan Holesovsky wrote:
> Markus has implemented a nice feature that should help keeping the bugs
> up to date: whenever you are committing / pushing to git, and you

ooh ! really lovely :-)

Great work Markus !

Michael.

--
[hidden email] <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Ivan Timofeev

Re: [ANN] Referencing bugs in commits

On 14.02.2012 19:31, Michael Meeks wrote:
>
> On Tue, 2012-02-14 at 16:16 +0100, Jan Holesovsky wrote:
>> Markus has implemented a nice feature that should help keeping the bugs
>> up to date: whenever you are committing / pushing to git, and you
>
> ooh ! really lovely :-)
>
> Great work Markus !

Indeed!!! :) I'm always exceedingly amazed at the work Markus do as a
free-time contributor.

Just a question:
Is it possible somehow include the information about a target version?

Best Regards,
Ivan

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Andras Timar

Re: [ANN] Referencing bugs in commits

2012/2/14 Ivan Timofeev <[hidden email]>:

> On 14.02.2012 19:31, Michael Meeks wrote:
>>
>>
>> On Tue, 2012-02-14 at 16:16 +0100, Jan Holesovsky wrote:
>>>
>>> Markus has implemented a nice feature that should help keeping the bugs
>>> up to date: whenever you are committing / pushing to git, and you
>>
>>
>> ooh ! really lovely :-)
>>
>> Great work Markus !
>
>
> Indeed!!! :) I'm always exceedingly amazed at the work Markus do as a
> free-time contributor.
>
> Just a question:
> Is it possible somehow include the information about a target version?
>

IMHO target version is not known at commit time. Developer commits the
fix to master and optionally asks for cherry picking. Whoever closes
the bug should update the target version in bugzilla.

Best regards,
Andras
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Pierre-André Jacquod

Re: [ANN] Referencing bugs in commits

In reply to this post by Jan Holesovsky

hello,

> The bug reference has to have fdo#ABCDE form (where ABCDE is the bug
> number), and has to be at the first line of the commit (it does not
> matter where on that line).

Sorry, one point is for me not clear:

by the first line, do you mean "title line" or would it works also as
first line of the comment (hence not being into the title) ?

Thanks
Pierre-André

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Michael Meeks-2

Re: [Libreoffice-qa] [ANN] Referencing bugs in commits

In reply to this post by Ivan Timofeev

On Tue, 2012-02-14 at 20:33 +0400, Ivan Timofeev wrote:
> Is it possible somehow include the information about a target version?

I guess that -should- be implicit in the branch it is committed to, so
- sounds feasible ;-) at least - the expert eye can see that information
there already.

ATB,

Michael.

--
[hidden email] <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Jan Holesovsky

Re: [ANN] Referencing bugs in commits

In reply to this post by Pierre-André Jacquod

Hi Pierre-André,

Pierre-André Jacquod píše v Út 14. 02. 2012 v 18:02 +0100:

> > The bug reference has to have fdo#ABCDE form (where ABCDE is the bug
> > number), and has to be at the first line of the commit (it does not
> > matter where on that line).
>
> Sorry, one point is for me not clear:
>
> by the first line, do you mean "title line" or would it works also as
> first line of the comment (hence not being into the title) ?

Has to be the title line, sorry for not being clear :-)

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Jan Holesovsky

Re: [ANN] Referencing bugs in commits

In reply to this post by Ivan Timofeev

Hi Ivan,

Ivan Timofeev píše v Út 14. 02. 2012 v 20:33 +0400:

> Is it possible somehow include the information about a target version?

Oh - great idea :-) Added that to the script; it does some best-effort
guess, by saying "It will be available in LibreOffice x.y.z.", where x.y
is derived from the branch name, and z is an increment of the highest
existing libreoffice-x-y-[0-9]*.

When it is cherry-picked to libreoffice-x-y-z explicitly, the message
about that will appear in the bug too, so an earlier inclusion is not an
issue.

Please test that it works :-)

Thank you,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Markus Mohrhard

Re: [Libreoffice-qa] [ANN] Referencing bugs in commits

In reply to this post by Andras Timar

Hey,

2012/2/14 Michael Stahl <[hidden email]>:

> On 14/02/12 17:48, Andras Timar wrote:
>> 2012/2/14 Ivan Timofeev <[hidden email]>:
>>> On 14.02.2012 19:31, Michael Meeks wrote:
>>>>
>>>>
>>>> On Tue, 2012-02-14 at 16:16 +0100, Jan Holesovsky wrote:
>>>>>
>>>>> Markus has implemented a nice feature that should help keeping the bugs
>>>>> up to date: whenever you are committing / pushing to git, and you
>>>>
>>>>
>>>> ooh ! really lovely :-)
>>>>
>>>> Great work Markus !
>>>
>>>
>>> Indeed!!! :) I'm always exceedingly amazed at the work Markus do as a
>>> free-time contributor.
>>>
>>> Just a question:
>>> Is it possible somehow include the information about a target version?
>>>
>> IMHO target version is not known at commit time. Developer commits the
>> fix to master and optionally asks for cherry picking. Whoever closes
>> the bug should update the target version in bugzilla.
>
> the way i got used to is to add one "target:x.y.z " for every branch
> that the fix got committed to, for example:
> "target:3.4.6 target:3.5.1 target:3.6.0beta0"
>
> it looks possible to do that from a git hook as well, incrementally
> (i.e. the field is extended if the current target of the branch isn't in
> the list already).
>
> but it would require that the hook knows which is the next release that
> is created from every branch at push time...
>

That should be possible. I have some ideas based on Kendy's first
implementation for that. It should be even possible to adapt the
target version from 3.5.1 to 3.5.0 if a commit is pushed to 3-5 and
later to 3-5-0.

I will think a bit about it and hopefully find a good solution soon.

Regards,
Markus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Lionel Elie Mamane

Re: [ANN] Referencing bugs in commits

In reply to this post by Jan Holesovsky

On Tue, Feb 14, 2012 at 07:49:04PM +0100, Jan Holesovsky wrote:
> Ivan Timofeev píše v Út 14. 02. 2012 v 20:33 +0400:

>> Is it possible somehow include the information about a target version?

> Oh - great idea :-) Added that to the script; it does some best-effort
> guess, (...)

> Please test that it works :-)

It seems to set "target:3.6" for commits to master. As per
http://wiki.documentfoundation.org/BugReport_Details, this should be
"3.6.0".

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Jan Holesovsky

Re: [ANN] Referencing bugs in commits

Hi Lionel,

On 2012-02-16 at 14:11 +0100, Lionel Elie Mamane wrote:

> It seems to set "target:3.6" for commits to master. As per
> http://wiki.documentfoundation.org/BugReport_Details, this should be
> "3.6.0".

Fixed :-)

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Lionel Elie Mamane

Re: [ANN] Referencing bugs in commits

In reply to this post by Jan Holesovsky

On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:

> whenever you are committing / pushing to git, and you
> reference the bugs.freedesktop.org bug in the commit message, it will
> automatically appear as a comment in the bug :-)

It seems not to happen this morning. In general, after how much time
after commit should we get worried and report it?

> ----- 8< -----
> fdo#45748: Don't use empty pages for computing the page break position
> ----- 8< -----

> It will result in the following comment in bugzilla:

> https://bugs.freedesktop.org/show_bug.cgi?id=45748#c7

It says:

$AUTHOR commited a patch related to this issue to "$BRANCH"

That's misleading. See e.g.
https://bugs.freedesktop.org/show_bug.cgi?id=45748#c9
and
http://cgit.freedesktop.org/libreoffice/core/commit/?id=66cf06ebdd4eeb95e801de114af06b49119fc7fe&g=libreoffice-3-5
Committed by Tor, but authored by Cédric. The message in the bug says
"Cédric committed".

I would suggest one of:

A patch by $AUTHOR related to this issue was committed to "$BRANCH"

(should it be "has been committed" maybe?)

or

$COMMITTER committed a patch by $AUTHOR related to this issue to "$BRANCH"

or
$AUTHOR's patch related to this issue was/has been committed to "$BRANCH"

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Jan Holesovsky

Re: [ANN] Referencing bugs in commits

Hi Lionel,

Lionel Elie Mamane píše v Pá 17. 02. 2012 v 09:23 +0100:

> > whenever you are committing / pushing to git, and you
> > reference the bugs.freedesktop.org bug in the commit message, it will
> > automatically appear as a comment in the bug :-)
>
> It seems not to happen this morning. In general, after how much time
> after commit should we get worried and report it?

fdo seems to have some problems (terribly slow today), and it has been
timing out. Generally, the comments should appear at the same time the
CIAbot reports appear on IRC.

> That's misleading. See e.g.
> https://bugs.freedesktop.org/show_bug.cgi?id=45748#c9
> and
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=66cf06ebdd4eeb95e801de114af06b49119fc7fe&g=libreoffice-3-5
> Committed by Tor, but authored by Cédric. The message in the bug says
> "Cédric committed".

I've now changed it to:

----- 8< -----
$author committed a patch related to this issue.
It has been pushed to "$branch":

... etc., as before ...
----- 8< -----

Any further tweaks possible, if it is still confusing.

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Markus Mohrhard

Re: [ANN] Referencing bugs in commits

In reply to this post by Lionel Elie Mamane

Hey,

2012/2/17 Lionel Elie Mamane <[hidden email]>:
> On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:
>
>> whenever you are committing / pushing to git, and you
>> reference the bugs.freedesktop.org bug in the commit message, it will
>> automatically appear as a comment in the bug :-)
>
> It seems not to happen this morning. In general, after how much time
> after commit should we get worried and report it?
>

This one was my mistake. It is quite difficult to test this scricpt so
that sometimes after a change or a new situation it does not update
the bug (please watch next week with pushing bugs to 3-5 and 3-5-1).
If you see a commit with a bug number announced by CIA bot and the
script did not update the bug drop Kendy and me a short note.

Regards,
Markus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Lionel Elie Mamane

Re: [ANN] Referencing bugs in commits

In reply to this post by Jan Holesovsky

On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:

> Markus has implemented a nice feature that should help keeping the bugs
> up to date: whenever you are committing / pushing to git, and you
> reference the bugs.freedesktop.org bug in the commit message, it will
> automatically appear as a comment in the bug :-)

When pushing to another branch than master or
libreoffice-3-5/libreoffice-3-5-* (in particular to a feature/*
branch), it sets an empty "target:" whiteboard; it should just not
touch the whiteboard instead of that empty non-informative tag.

Example:

https://bugs.freedesktop.org/show_bug.cgi?id=48345

[hidden email] changed:

What |Removed |Added
----------------------------------------------------------------------------
Status Whiteboard| |target:

--- Comment #4 from [hidden email] 2012-05-15 09:53:22 PDT ---
Lionel Elie Mamane committed a patch related to this issue.
It has been pushed to "features/base-preview":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=e0ef49f034561fcfb024482c1e532c9cae6f5d14&g=features/base-preview

fdo#48345 need to refresh row also when not m_bRowCountFinal

--
Lionelx
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Markus Mohrhard

Re: [ANN] Referencing bugs in commits

Hey Lionel,

> When pushing to another branch than master or
> libreoffice-3-5/libreoffice-3-5-* (in particular to a feature/*
> branch), it sets an empty "target:" whiteboard; it should just not
> touch the whiteboard instead of that empty non-informative tag.
>

Hopefully I have fixed this now. Thanks for the bug report.

Regards,
Markus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Lionel Elie Mamane

Re: [ANN] Referencing bugs in commits

In reply to this post by Jan Holesovsky

On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:

> Markus has implemented a nice feature that should help keeping the bugs
> up to date: whenever you are committing / pushing to git, and you
> reference the bugs.freedesktop.org bug in the commit message, it will
> automatically appear as a comment in the bug :-)

It now sets weird targets for commits to libreoffice-3-6:

target:3.6.3.6Beta1 in fdo#47473
3.6Beta1 in fdo#47325

(the last is without target, was manually corrected by human later)

From what I remember from the documentation of target: on the wiki, it
should not have "beta", so that queries stay sane, only 3.6.0. OTOH, I
very much agree that the info of in which beta/rc it is supposed to be
fixed is *very* useful for checking that the bug is really fixed!

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Markus Mohrhard

Re: [ANN] Referencing bugs in commits

Hello Lionel,

2012/6/5 Lionel Elie Mamane <[hidden email]>:

> On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:
>
>> Markus has implemented a nice feature that should help keeping the bugs
>> up to date: whenever you are committing / pushing to git, and you
>> reference the bugs.freedesktop.org bug in the commit message, it will
>> automatically appear as a comment in the bug :-)
>
> It now sets weird targets for commits to libreoffice-3-6:
>
> target:3.6.3.6Beta1 in fdo#47473
> 3.6Beta1 in fdo#47325
>
> (the last is without target, was manually corrected by human later)
>
> From what I remember from the documentation of target: on the wiki, it
> should not have "beta", so that queries stay sane, only 3.6.0. OTOH, I
> very much agree that the info of in which beta/rc it is supposed to be
> fixed is *very* useful for checking that the bug is really fixed!
>

This was the result of a discussion between Kendy and me. During the
beta phase it is not helpful to add 3.6.0 to the whiteboard line
because it covers in this time nearly 6 weeks. Setting the right
version as target may help users to test this as early as possible.

I hope I fixed this problem now.

Regards,
Markus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice