Re: Context diffs

2021-01-05 Thread Bruce Momjian
to accept nearly everything that anyone posts here (after a step > > > that tries to unpack tarballs etc). Several people have suggested I > > > change it to use git apply instead (IIRC it works better for patches > > > containing binary files such as cryptographic keys?), b

Re: Context diffs

2021-01-05 Thread Andrew Dunstan
On 1/5/21 12:58 PM, Bruce Momjian wrote: > On Tue, Jan 5, 2021 at 11:21:07AM +1300, Thomas Munro wrote: >> On Tue, Jan 5, 2021 at 8:07 AM Bruce Momjian wrote: >>> * "git apply" and "git am" can't process context diffs (they throw an >>>

Re: Context diffs

2021-01-05 Thread Thomas Munro
es to unpack tarballs etc). Several people have suggested I > > change it to use git apply instead (IIRC it works better for patches > > containing binary files such as cryptographic keys?), but then it > > wouldn't accept ye olde context diffs. > > Does Windows also use

Re: Context diffs

2021-01-05 Thread Bruce Momjian
On Tue, Jan 5, 2021 at 11:21:07AM +1300, Thomas Munro wrote: > On Tue, Jan 5, 2021 at 8:07 AM Bruce Momjian wrote: > > * "git apply" and "git am" can't process context diffs (they throw an > >error once a context-like section of the diff is hit;

Re: Context diffs

2021-01-05 Thread Bruce Momjian
On Mon, Jan 4, 2021 at 02:42:16PM -0500, Tom Lane wrote: > Bruce Momjian writes: > > Our developer FAQ mentions context diffs in several places for their > > improved readability: > > https://wiki.postgresql.org/wiki/Developer_FAQ > > I think that's kind of

Re: Context diffs

2021-01-05 Thread Andrew Dunstan
On 1/4/21 5:21 PM, Thomas Munro wrote: > On Tue, Jan 5, 2021 at 8:07 AM Bruce Momjian wrote: >> * "git apply" and "git am" can't process context diffs (they throw an >>error once a context-like section of the diff is hit; simple >>adding

Re: Context diffs

2021-01-04 Thread Noah Misch
On Tue, Jan 05, 2021 at 11:21:07AM +1300, Thomas Munro wrote: > On Tue, Jan 5, 2021 at 8:07 AM Bruce Momjian wrote: > > * "git apply" and "git am" can't process context diffs (they throw an > >error once a context-like section of the diff is hit;

Re: Context diffs

2021-01-04 Thread Thomas Munro
On Tue, Jan 5, 2021 at 8:07 AM Bruce Momjian wrote: > * "git apply" and "git am" can't process context diffs (they throw an >error once a context-like section of the diff is hit; simple >adding/removing lines in a block works) > > * the com

Re: Context diffs

2021-01-04 Thread Peter Geoghegan
On Mon, Jan 4, 2021 at 11:07 AM Bruce Momjian wrote: > * "git apply" and "git am" can't process context diffs (they throw an >error once a context-like section of the diff is hit; simple >adding/removing lines in a block works) I think that this is the

Re: Context diffs

2021-01-04 Thread Tom Lane
Bruce Momjian writes: > Our developer FAQ mentions context diffs in several places for their > improved readability: > https://wiki.postgresql.org/wiki/Developer_FAQ I think that's kind of out of date; AFAIK the majority of hackers think -u format is more readable. (Fo

Context diffs

2021-01-04 Thread Bruce Momjian
Our developer FAQ mentions context diffs in several places for their improved readability: https://wiki.postgresql.org/wiki/Developer_FAQ I also know git can product context diff as _output_. However, there are several negatives to context vs unified diffs in our workflow: * &quo

Re: Time to put context diffs in the grave

2018-06-19 Thread Andrew Dunstan
ormat preferences on other people. Am I the only one that doesn't use context diffs and also doesn't hate them with a passion? No. I don't get it. But I do get it. I won't even start on the things that bug me :-) cheers andrew -- Andrew Dunstanhttps://www.2

Re: Time to put context diffs in the grave

2018-06-19 Thread Peter Geoghegan
the only one that doesn't use context diffs and also doesn't hate them with a passion? I don't get it. > There's already a (perhaps underdocumented) way to make regression > diffs look the way you want in local runs. Actually, it is documented. -- Peter Geoghegan

Re: Time to put context diffs in the grave

2018-06-19 Thread Andres Freund
On 2018-06-19 17:41:00 -0400, Tom Lane wrote: > Andrew Dunstan writes: > > On 06/19/2018 05:21 PM, Andres Freund wrote: > >> Given that we've "officially" stopped relying on context diffs, > >> I don't see why we'd not also retire them in p

Re: Time to put context diffs in the grave

2018-06-19 Thread Tom Lane
Andrew Dunstan writes: > On 06/19/2018 05:21 PM, Andres Freund wrote: >> Given that we've "officially" stopped relying on context diffs, >> I don't see why we'd not also retire them in pg_regress. > Well I suspect at least one person would be made unha

Re: Time to put context diffs in the grave

2018-06-19 Thread Andrew Dunstan
On 06/19/2018 05:21 PM, Andres Freund wrote: Given that we've "officially" stopped relying on context diffs, I don't see why we'd not also retire them in pg_regress. Well I suspect at least one person would be made unhappy ;-) cheers andrew -- Andrew Dunstan

Re: Time to put context diffs in the grave

2018-06-19 Thread Andres Freund
considerable time looking for errors - but I don't see why that would be related to this change. Given that we've "officially" stopped relying on context diffs, I don't see why we'd not also retire them in pg_regress. Greetings, Andres Freund

Re: Time to put context diffs in the grave

2018-06-19 Thread Andrew Dunstan
On 06/19/2018 04:54 PM, Andres Freund wrote: Hi, On 2018-05-21 21:51:11 -0400, Andrew Dunstan wrote: We haven't insisted on context diffs in years now, and one of my interlocutors has just turned handsprings trying to follow the advice at <https://wiki.postgresql.org/wiki/Working_

Re: Time to put context diffs in the grave

2018-06-19 Thread Andres Freund
Hi, On 2018-05-21 21:51:11 -0400, Andrew Dunstan wrote: > > We haven't insisted on context diffs in years now, and one of my > interlocutors has just turned handsprings trying to follow the advice at > <https://wiki.postgresql.org/wiki/Working_with_Git> to pr

Re: Time to put context diffs in the grave

2018-06-19 Thread Bruce Momjian
On Wed, May 23, 2018 at 05:01:58PM -0400, Tom Lane wrote: > Andrew Dunstan writes: > > OK, that's done. Now I think we can get rid of git-external-diff. > > I for one rely on that. I won't tell anyone else what kind of diff > they have to read, but if you try to tell me what kind of diff I have

Re: Time to put context diffs in the grave

2018-05-23 Thread Andrew Dunstan
On Wed, May 23, 2018 at 5:01 PM, Tom Lane wrote: > Andrew Dunstan writes: >> OK, that's done. Now I think we can get rid of git-external-diff. > > I for one rely on that. I won't tell anyone else what kind of diff > they have to read, but if you try to tell me what kind of diff I have > to read,

Re: Time to put context diffs in the grave

2018-05-23 Thread Tom Lane
Andrew Dunstan writes: > OK, that's done. Now I think we can get rid of git-external-diff. I for one rely on that. I won't tell anyone else what kind of diff they have to read, but if you try to tell me what kind of diff I have to read, I'm going to complain. > While we're about it, does anyone

Re: Time to put context diffs in the grave

2018-05-23 Thread Andrew Dunstan
On Mon, May 21, 2018 at 10:52 PM, Andres Freund wrote: > Hi, > > On 2018-05-21 21:51:11 -0400, Andrew Dunstan wrote: >> We haven't insisted on context diffs in years now, and one of my >> interlocutors has just turned handsprings trying to follow the advice at >> &

Re: Time to put context diffs in the grave

2018-05-22 Thread Michael Paquier
On Tue, May 22, 2018 at 06:59:56PM +0900, Kyotaro HORIGUCHI wrote: > filterdiff has a bug that we can lose a part of hunks with it, > and I actually have stepped on it. I saw Álvaro made a complaint > about the bug but it doesn't seem to have been fixed. It is the > most major reason I'm posting pa

Re: Time to put context diffs in the grave

2018-05-22 Thread Kyotaro HORIGUCHI
At Mon, 21 May 2018 21:51:11 -0400, Andrew Dunstan wrote in <247f4d65-31f3-d426-2b24-fc434fa67...@2ndquadrant.com> > > We haven't insisted on context diffs in years now, and one of my > interlocutors has just turned handsprings trying to follow the advice > at <https:

Re: Time to put context diffs in the grave

2018-05-22 Thread Michael Paquier
On Mon, May 21, 2018 at 09:51:11PM -0400, Andrew Dunstan wrote: > Unless someone objects really violently I'm going to rip all that stuff out > and let sanity prevail. Please! -- Michael signature.asc Description: PGP signature

Re: Time to put context diffs in the grave

2018-05-21 Thread David Fetter
On Mon, May 21, 2018 at 09:51:11PM -0400, Andrew Dunstan wrote: > > We haven't insisted on context diffs in years now, and one of my > interlocutors has just turned handsprings trying to follow the advice at > <https://wiki.postgresql.org/wiki/Working_with_Git> to pr

Re: Time to put context diffs in the grave

2018-05-21 Thread Andres Freund
Hi, On 2018-05-21 21:51:11 -0400, Andrew Dunstan wrote: > We haven't insisted on context diffs in years now, and one of my > interlocutors has just turned handsprings trying to follow the advice at > <https://wiki.postgresql.org/wiki/Working_with_Git> to produce his first >

Time to put context diffs in the grave

2018-05-21 Thread Andrew Dunstan
We haven't insisted on context diffs in years now, and one of my interlocutors has just turned handsprings trying to follow the advice at <https://wiki.postgresql.org/wiki/Working_with_Git> to produce his first patch. Unless someone objects really violently I'm going to ri