[ANN] Please use Gerrit from now on for Patch Review

Hi all,

with:

 http://sweetshark.livejournal.com/13298.html

gerrit is documented and ready to go. Please use it for code review as much as
possible now as it simplifies things a lot over manual patch fiddling on
mailing lists. I will update the EasyHacks to point to gerrit instead in the
next days.
The last remaining step will be making the repo at gerrit the reference (and
the one at freedesktop a read-only mirror). I assume that to be prepared and
done until mid-July(*).
From that point on, we will have a lot of opportunity to improve our tinderbox
testing and reporting, making life easier and better for everyone working on
the codebase.

Best,

Bjoern

(*) Along with the "other" repos.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Mon, 2012-06-18 at 12:09 +0200, Bjoern Michaelsen wrote:
> gerrit is documented and ready to go.

Can I get superquick overview of "why gerrit?". e.g. the problems we
have that gerrit fixes. My biggest concern has always been that patches
go into gerrit and disappear in an out of sight out of mind sort of
thing.

C.

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

Hi Bjoern,

On 2012-06-18 at 12:09 +0200, Bjoern Michaelsen wrote:

>  http://sweetshark.livejournal.com/13298.html
>
> gerrit is documented and ready to go. Please use it for code review as much as
> possible now as it simplifies things a lot over manual patch fiddling on
> mailing lists.

Can you please write down step by step commands for those who do the
manual patch fiddling on the ML how the new workflow is supposed to look
like?  Ie. how does it differ to the current

[click save as in the mailer]
git am ~/patches/0001-<hit-tab>
git log -p -1
[build if necessary]
git push
rm ~/patches/0001-<hit-tab>

?

Thank you,
Kendy

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

Bjoern Michaelsen píše v Po 18. 06. 2012 v 12:09 +0200:
> Hi all,
>
> with:
>
>  http://sweetshark.livejournal.com/13298.html
>
> gerrit is documented and ready to go.

Ah, there are several strange and long commands.

Also I miss the cooperation with the mailing list. I remember that the
main request was that mailing list will stay the main communication
point between developers. All patches that need review must be mentioned
there.

It means that gerrit should be able to detect patches for review on the
mailing list, integrate them, and make them ready for review.

My expectation would be that it sends a replay to the mailing list with
a link to diff, link to build results and commands to approve it.

Similar mail should be send for patches that were directly pushed into
gerrit for review. Of course, it must not send mail for every single
patch but just for patches where the developer explicitly asks for
review, so the numbers of mails on the mailing list stays the same.

> Please use it for code review as much as possible now as it simplifies
>  things a lot over manual patch fiddling on mailing lists. I will
>  update the EasyHacks to point to gerrit instead in the next days.

IMHO, we first need to conclude that gerrit is in usable state.


> The last remaining step will be making the repo at gerrit the reference (and
> the one at freedesktop a read-only mirror). I assume that to be prepared and
> done until mid-July(*).

Same here.

Best Regards,
Petr

PS: To make it clear. I am neutral about gerrit. I see some advantages
and also some risks. In each case, we must make Caolan, Kendy, Michael,
Stefan, Eike, Miklos, and all other very active patch reviewers happy
with it. I am excited when I look at the current mailing list and see so
many patches reviewed a pushed within one or two days. It helps to make
contributors active. It helps me a lot to do the tag in time. We must
not break this flow!

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

On Tue, Jun 19, 2012 at 08:57:28AM +0100, Caolán McNamara wrote:
> Can I get superquick overview of "why gerrit?". e.g. the problems we
> have that gerrit fixes.

Gerrit will prevent exactly what you describe below, that is people having to
harvest across the mailing list for patches and never being quite sure if
something was missed.

> My biggest concern has always been that patches
> go into gerrit and disappear in an out of sight out of mind sort of
> thing.

Once:

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

is in place, that cant happen really. OTOH you should start using it now, so
that we do have a big 'how do I use this thing' confusion on switchover.

Best,

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

So,

On Mon, 2012-06-18 at 12:09 +0200, Bjoern Michaelsen wrote:
>  http://sweetshark.livejournal.com/13298.html
>
> gerrit is documented and ready to go. Please use it for code review
> as much as

        Personally I'd like to see where we're at with gerrit, how it works,
get people trained up in the command-line tooling, and get a final
sign-off from the ESC before we encourage world+wife to deploy this.

        It sounds very promising - and useful in principle; but I'd like to see
for myself that it actually works, and does so in a way that actively
helps rather than hindering people.

        Your write-up no doubt goes some way towards this of course.

        ATB,

                Michael.

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

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

On Tue, Jun 19, 2012 at 10:31:08AM +0200, Jan Holesovsky wrote:
Oehm, see the links to the wiki in the blog post?

Best,

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

Hi Bjoern,

On 2012-06-19 at 11:30 +0200, Bjoern Michaelsen wrote:

If you answer was that the new workflow would be:

- click a link in a mail from gerrit
  - that will open the syntax-highlighted cgit-like patch in the
    browser, on a page with a big [Push it!] button + space to write the
    "Thank you" message
- I write the "Thank you" message + hit the [Push it!] button

I would be happy.  But is it going to be so?  So far the best I've got
from gerrit was clicking [Diff all unified], that opened one browser
window per file (ugh!), with more clicking to actually do the review.

Maybe the command line interface will be easier to use, but

https://wiki.documentfoundation.org/Development/gerrit/PatchReview

did not convince me that it "simplifies things a lot over manual patch
fiddling" - described in my quoted mail.  So I still hope in some better
description.

Thank you,
Kendy

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

On Tue, Jun 19, 2012 at 11:54:25AM +0200, Jan Holesovsky wrote:
> Maybe the command line interface will be easier to use, but
>
> https://wiki.documentfoundation.org/Development/gerrit/PatchReview
>
> did not convince me that it "simplifies things a lot over manual patch
> fiddling" - described in my quoted mail.  So I still hope in some better
> description.

Yes, I would assume that for nontrival patches using it from the command line
is the easiest workflow. You essentially do everything in git. Note also that
the exception for submitting the patch (that is pushing to fdo for now) will be
gone once gerrit "owns" the repo. Then all you do is a "gerrit review" like
everyone else. So the workflow is currently more complex than it needs to be.

The real advantage though is not sprinkling in the patches in a mailing list
and have a good status on if it is merged.

Best,

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

On Tue, Jun 19, 2012 at 08:57:28AM +0100, Caolán McNamara wrote:
> On Mon, 2012-06-18 at 12:09 +0200, Bjoern Michaelsen wrote:
> > gerrit is documented and ready to go.
>
> Can I get superquick overview of "why gerrit?". e.g. the problems we
> have that gerrit fixes. My biggest concern has always been that patches
> go into gerrit and disappear in an out of sight out of mind sort of
> thing.

Here is a list of things from the top of my head:
- patches are not sprinkled in a incredable high-volume mailing list that
  casual contributors will not follow
- asking new contributors to subscribe to that list is a barrier to entry on
  its own
- status of patches is intrinsically tracked, no "ups, that one was picked
  already, but never reported to the ml" anymore
- patches are tracked in a sane way -- this will allow working/reviewing the
  patches from git/commandline, the web, on IRC with stuff like:
  - request backporting to release branch on IRC
  - notify of a review request on IRC
  - daily mail of open patches to the dev-list
- providing fixed and updated versions of the patch works in a way that is not
  confusing and errorprone
  (see for example the iterations of:
  https://gerrit.libreoffice.org/#/c/179/
  and imagine it on a mailing list)
- might or might not be a topic: We can script to check for the patch license
  automatically
- tinderboxing (a topic on its own):
  - allows pre-master build testing of patches:
    - this will hopefully reduce the amount of build breakers
    - give everyone access to a windows build _before_ the patch hits master
    - same for subsequent tests
  - probabilistic commit testing (see other mail)
  - tinderboxes mailing down a new contributor with 50 mails "one of you did
    evil things" is the safest way to not make them come back again.

Note that even when we switch the repo over gerrit, everyone who had direct
commit access to fdo, will get direct commit access (bypassing all reviews and
tests) again in the beginning(*). However, it will enable all of the above and
finally get us moving there.

I forgot prolly a lot. Norbert, any additions?

Best,

Bjoern


(*) That is, if you did the initial setup there on time. You were all asked to
get yourself an account on gerrit more than a month ago. Dont blame the admins
if you stumble in with 400 others in the last minute.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Tue, Jun 19, 2012 at 11:54:25AM +0200, Jan Holesovsky wrote:
That will be the workflow in the end (when gerrit owns the repo). As for seeing
the diff: we now have gitweb integrated there(*), so ignore "Diff all unified" and
just use the "gitweb" links (see here: https://gerrit.libreoffice.org/#/c/179/).

Then click on "review" select  "+1 verified/+2 code-review", write thank you
below and it will be cherry-picked on master and the submitter will get a mail.

The second step however does not yet work as long as gerrit does not own the
repository. Thats why it is so damn important, that everyone gets his gerrit
account set up as requested a month ago, so that we can switch over completely.

Best,

Bjoern

(*) Big Thanks to Robert Einsle for that!
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Tue, Jun 19, 2012 at 11:13:45AM +0200, Petr Mladek wrote:
> It means that gerrit should be able to detect patches for review on the
> mailing list, integrate them, and make them ready for review.
>
> My expectation would be that it sends a replay to the mailing list with
> a link to diff, link to build results and commands to approve it.

Please provide constructive feedback to for example:

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

and

 http://nabble.documentfoundation.org/gerrit-for-release-branches-bots-ftw-tp3990804.html

implementing this "into the blind" just for it to be rejected by those who
where silent before is not the way to go.

Best,

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

On Tue, Jun 19, 2012 at 4:54 AM, Jan Holesovsky <[hidden email]> wrote:
> I would be happy.  But is it going to be so?  So far the best I've got
> from gerrit was clicking [Diff all unified], that opened one browser
> window per file (ugh!), with more clicking to actually do the review.

We added gitweb in gerrit so for example:

on the page

https://gerrit.libreoffice.org/#/c/222/

if you click on the (gitweb) link, next to 'Patchset 1 <sha>'

you'll get to
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=7660799346bb846890eb08e556933b5850158e0d
and to
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=7660799346bb846890eb08e556933b5850158e0d

(maybe we can make it go to commit-diff directly... to be investigated)

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

Hi Bjoern,

On 2012-06-19 at 13:03 +0200, Bjoern Michaelsen wrote:

Great, thank you, now we are getting somewhere :-)  So how do we deal
with the usability improvements here?  [Eg. to remove the unhelpful
"Diff all unified" button, or tweak it to point to cgit or gitweb;
removing unnecessary stuff not to overwhelm people; etc.]

> The second step however does not yet work as long as gerrit does not own the
> repository. Thats why it is so damn important, that everyone gets his gerrit
> account set up as requested a month ago, so that we can switch over completely.

"damn important" will not get you there, I am afraid - only explaining,
and making it no harder than the current workflow will do.

> (*) Big Thanks to Robert Einsle for that!

Thanks Robert for doing that!  Please - is there any chance to use cgit
instead, so that it is compatible / familiar with the freedesktop
browsing?

Thank you,
Kendy

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

On Tue, Jun 19, 2012 at 7:05 AM, Jan Holesovsky <[hidden email]> wrote:
> Thanks Robert for doing that!  Please - is there any chance to use cgit
> instead, so that it is compatible / familiar with the freedesktop
> browsing?

in theory it is... but gitweb was working out of the box....
Is there any significant difference ?

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

Hi Norbert,

On 2012-06-19 at 07:23 -0500, Norbert Thiebaud wrote:

> > Thanks Robert for doing that!  Please - is there any chance to use cgit
> > instead, so that it is compatible / familiar with the freedesktop
> > browsing?
>
> in theory it is... but gitweb was working out of the box....
> Is there any significant difference ?

Not that significant; I think the familiarity with what we have is the
greatest plus.

cgit is a bit better usable in the sense that you do not have to click
that much there as in gitweb, and also looks better (not overwhelming
you with possibilities you won't use anyway, the color bars to see how
much has changed in the file, less distracting colors in diffs)

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=e16ac6937245977b7900c48a408be2c589f6a0a6;hp=951ed65898208a7597c813141ed160716708d348

vs.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=e16ac6937245977b7900c48a408be2c589f6a0a6

The configuration is trivial, you just edit /etc/cgitrc to point to the
repos, and you are done; but of course I have no idea how well does it
play with gerrit.

Thank you,
Kendy

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

Hi Kendy,


>
> The configuration is trivial, you just edit /etc/cgitrc to point to the
> repos, and you are done; but of course I have no idea how well does it
> play with gerrit.

My "Problem" was the Integration of cgit in gerrit. If it helps, i can
install cgit as Standalone App beyond the gerrit-URL, but the
integration in gerrit won't run for me. But i can do it not befor next week.
>
> Thank you,
> Kendy
>
Robert

--
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint

Robert Einsle  <[hidden email]>
Admin Team / Infrastructure
Mobile: +49 175 5602901  Skype: reinsle

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

Hi Bjoern,

On 2012-06-19 at 12:50 +0200, Bjoern Michaelsen wrote:

> (*) That is, if you did the initial setup there on time. You were all asked to
> get yourself an account on gerrit more than a month ago. Dont blame the admins
> if you stumble in with 400 others in the last minute.

The wiki page says you have to create a ssh key; I hope it is not
necessary, and one can reuse his fd.o key?  If yes - can we automate
that in any way, to save the admins work?

And - in the ideal case when everything is working as expected, will
there be need for fd.o accounts, or the later people with direct push
access will be OK with just the gerrit ssh key?

Thank you,
Kendy

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

Quoting Norbert Thiebaud <[hidden email]>:

> On Tue, Jun 19, 2012 at 7:05 AM, Jan Holesovsky <[hidden email]> wrote:
>> Thanks Robert for doing that!  Please - is there any chance to use cgit
>> instead, so that it is compatible / familiar with the freedesktop
>> browsing?
>
> in theory it is... but gitweb was working out of the box....
gerrit cgit integration is working out of the box:
http://code.google.com/p/gerrit/issues/detail?id=371

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

On Tue, Jun 19, 2012 at 03:09:34PM +0200, Jan Holesovsky wrote:
> The wiki page says you have to create a ssh key; I hope it is not
> necessary, and one can reuse his fd.o key?  If yes - can we automate
> that in any way, to save the admins work?

Thats a bit tricky - we can try to get the fd.o guys to throw the public keys
over the fence, but to map them to the gerrit accounts, you would have to:
- create the account (login with OpenID once)
- add your email address in the preferences
at which point you are almost there anyway. Also I dont know if fd.o has a
key-to-git-email-mapping at all.

> And - in the ideal case when everything is working as expected, will
> there be need for fd.o accounts, or the later people with direct push
> access will be OK with just the gerrit ssh key?

Just the gerrit key. In the ideal case, there wont be a need for fd.o accounts
anymore -- it will be a read-only mirror in the end. This also has the
advantage that we take complete control over commit access ourselves --
hoppefully speeding up the time to give someone commit acccess(*).

Best,

Bjoern

(*) Well, with gerrit everybody has reviewed commit access. But we would even
control on our own, who we give access to commit to master without/bypassing
review (which will be those who have commit access on fdo now in the
beginning).

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