Re: [openssl-project] build/test before merging

2018-05-24 Thread Dr. Matthias St. Pierre

Well, I use --fixup and --squash mostly nowadays, but I'm not sure everybody 
switched. It was not a feature request, only a remark.

-Urspr√ľngliche Nachricht-
Von: openssl-project <openssl-project-boun...@openssl.org> Im Auftrag von 
Richard Levitte
Gesendet: Donnerstag, 24. Mai 2018 22:43
An: openssl-project@openssl.org
Betreff: Re: [openssl-project] build/test before merging

Those are non-standard and a matter of personal taste. I used those before I 
discovered --fixup and --squash. How many variants should we support?

(I'm not totally against the idea, mind you...) 

Cheers
Richard

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project

Re: [openssl-project] build/test before merging

2018-05-23 Thread Matt Caswell


On 23/05/18 16:50, Benjamin Kaduk wrote:
> On Wed, May 23, 2018 at 03:12:30PM +, Dr. Matthias St. Pierre wrote:
>>> So do you guys use the ghmerge script or own procedures?  I'm curious.
>>
>> At the beginnning, I tried to use ghmerge but it was not flexible
>> enough for my needs. In particular, it only gives me the choice
>> between squashing everything or leaving everything as it is. Most
>> notably, it does not support partial squashing by interactive
>> rebasing. Or alternatively: pausing + letting me fix something +
>> resuming. What I also dislike is that it uses a lot of GitHub API
> 
> Sorry for partially hijacking the thread, but this reminds me that
> several people have started using the "git commit --fixup" tooling,
> which is in general helpful for the reviewer (to know what the
> squashing intention is).

It's also helpful because it preserves the history of the review (you
can see what changed since the last time you looked at it).

> 
> But I am curious if we currently do and/or should have a commit hook
> on git.openssl.org to reject commits that start with "!fixup".

Not that I know of. We probably should have. A quick check reveals two
such commits that have made it into master...both mine unfortunately :-(

Matt

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Dr. Matthias St. Pierre
> But I am curious if we currently do and/or should have a commit hook on 
> git.openssl.org to reject commits that start with "!fixup".

We probably don't, but it's a good idea to have it.

Matthias

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Benjamin Kaduk
On Wed, May 23, 2018 at 03:12:30PM +, Dr. Matthias St. Pierre wrote:
> > So do you guys use the ghmerge script or own procedures?  I'm curious.
> 
> At the beginnning, I tried to use ghmerge but it was not flexible
> enough for my needs. In particular, it only gives me the choice
> between squashing everything or leaving everything as it is. Most
> notably, it does not support partial squashing by interactive
> rebasing. Or alternatively: pausing + letting me fix something +
> resuming. What I also dislike is that it uses a lot of GitHub API

Sorry for partially hijacking the thread, but this reminds me that
several people have started using the "git commit --fixup" tooling,
which is in general helpful for the reviewer (to know what the
squashing intention is).

But I am curious if we currently do and/or should have a commit hook
on git.openssl.org to reject commits that start with "!fixup".

-Ben
___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Dr. Matthias St. Pierre
  
> +1 for python! :)

Well, if this is a "go for it"... ;-)

Oh, and I forgot to mention 'ghtool cherry-pick {110,102}'

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Salz, Rich
>Unfortunately, I didn't have time to follow my vision yet. Also, it would 
> have been easier for me to do it in Python than in Perl.
  
+1 for python! :)

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Matt Caswell


On 23/05/18 01:43, Salz, Rich wrote:
> > I do the same, but I am reluctant having a script doing it for me using 
> some fixed recipe...
> 
>>I'm happy doing the build/test manually before merging, too.
>   
> 
> So do you guys use the ghmerge script or own procedures?  I'm curious.

I tried it once. Didn't like it, so I always do my own procedure.

Matt

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-23 Thread Richard Levitte
In message <25feb2a8-b363-443d-bae8-c47d1ad92...@akamai.com> on Wed, 23 May 
2018 00:43:58 +, "Salz, Rich"  said:

rsalz> > I do the same, but I am reluctant having a script doing it for me 
using some fixed recipe...
rsalz> 
rsalz> >I'm happy doing the build/test manually before merging, too.
rsalz>   
rsalz> 
rsalz> So do you guys use the ghmerge script or own procedures?  I'm curious.

I use addrev and git commands.  ghmerge does too much for my taste.

-- 
Richard Levitte levi...@openssl.org
OpenSSL Project http://www.openssl.org/~levitte/
___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-22 Thread Benjamin Kaduk
On Wed, May 23, 2018 at 12:43:58AM +, Salz, Rich wrote:
> > I do the same, but I am reluctant having a script doing it for me using 
> some fixed recipe...
> 
> >I'm happy doing the build/test manually before merging, too.
>   
> 
> So do you guys use the ghmerge script or own procedures?  I'm curious.

My own procedures (the addrev script and push by hand).

-Ben
___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project


Re: [openssl-project] build/test before merging

2018-05-22 Thread Viktor Dukhovni


> On May 22, 2018, at 8:43 PM, Salz, Rich  wrote:
> 
> So do you guys use the ghmerge script or own procedures?  I'm curious.

Good point, I've not yet had a chance to look at ghmerge and figure
out how/whether to use it.  If that continues, ... my preferences for
its implementation don't carry much weight!  [ Though some changes might
prolong my state of indifference... ]

-- 
Viktor.

___
openssl-project mailing list
openssl-project@openssl.org
https://mta.openssl.org/mailman/listinfo/openssl-project