Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-06-01 Thread Johannes Schindelin
Hi Ramsay, On Wed, 9 May 2018, Ramsay Jones wrote: > On 05/05/18 20:41, Johannes Schindelin wrote: > [snip] > > [Sorry for the late reply - still catching up after (long weekend) > UK public holiday] > > > Well, what I would want to do is let the cloud work for me. By adding an > > automated

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-09 Thread Ramsay Jones
On 05/05/18 20:41, Johannes Schindelin wrote: [snip] [Sorry for the late reply - still catching up after (long weekend) UK public holiday] > Well, what I would want to do is let the cloud work for me. By adding an > automated build to my Visual Studio Team Services (VSTS) account, of > course,

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-05 Thread Johannes Schindelin
Hi Elijah, On Fri, 4 May 2018, Elijah Newren wrote: > On Thu, May 3, 2018 at 11:40 PM, Johannes Schindelin > wrote: > > I actually have a hacky script to fixup commits in a patch series. It lets > > me stage part of the current changes, then figures out which of the

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-05 Thread Johannes Schindelin
Hi Ramsay, On Fri, 4 May 2018, Ramsay Jones wrote: > On 04/05/18 07:40, Johannes Schindelin wrote: > [snip] > > BTW I ran `make sparse` for the first time, and it spits out tons of > > stuff. And I notice that they are all non-fatal warnings, but so were the > > ones you pointed out above. This

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Elijah Newren
On Thu, May 3, 2018 at 11:40 PM, Johannes Schindelin wrote: > I actually have a hacky script to fixup commits in a patch series. It lets > me stage part of the current changes, then figures out which of the > commits' changes overlap with the staged changed. If there

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Ramsay Jones
On 04/05/18 07:40, Johannes Schindelin wrote: [snip] > BTW I ran `make sparse` for the first time, and it spits out tons of > stuff. And I notice that they are all non-fatal warnings, but so were the > ones you pointed out above. This is a bit sad, as I would *love* to > install a VSTS build

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Duy Nguyen
On Fri, May 4, 2018 at 5:23 PM, Johannes Schindelin wrote: >> > So that's what `info` does: it influences whether/where >> > the command is listed in `git help`'s output... Interesting. I thought the >> > lines here were trying to automate parts of the tab completion

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Johannes Schindelin
Hi Duy, On Fri, 4 May 2018, Duy Nguyen wrote: > On Fri, May 4, 2018 at 9:23 AM, Johannes Schindelin > wrote: > > Oh, okay. It was not at all clear to me what the exact format and role of > > these lines are... > > Noted. I'm making more updates in this file in

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Duy Nguyen
On Fri, May 04, 2018 at 04:44:49PM +0200, Duy Nguyen wrote: > On Fri, May 4, 2018 at 9:23 AM, Johannes Schindelin > wrote: > > Oh, okay. It was not at all clear to me what the exact format and role of > > these lines are... > > Noted. I'm making more updates in this

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Duy Nguyen
On Fri, May 4, 2018 at 9:23 AM, Johannes Schindelin wrote: > Oh, okay. It was not at all clear to me what the exact format and role of > these lines are... Noted. I'm making more updates in this file in another topic and will add some explanation so the next guy will

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Eric Sunshine
On Fri, May 4, 2018 at 2:52 AM, Johannes Schindelin wrote: > On Thu, 3 May 2018, Eric Sunshine wrote: >> On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin >> wrote: >> > +static const char * const builtin_branch_diff_usage[] = { >> > +

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Johannes Schindelin
Hi Duy, On Fri, 4 May 2018, Duy Nguyen wrote: > On Thu, May 3, 2018 at 10:32 PM, Johannes Schindelin > wrote: > > > > On Thu, 3 May 2018, Johannes Schindelin wrote: > > > >> On Thu, 3 May 2018, Duy Nguyen wrote: > >> > >> > On Thu, May 3, 2018 at 5:30 PM, Johannes

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Johannes Schindelin
Hi Eric, On Thu, 3 May 2018, Eric Sunshine wrote: > On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin > wrote: > > This builtin does not do a whole lot so far, apart from showing a usage > > that is oddly similar to that of `git tbdiff`. And for a good reason: > >

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Johannes Schindelin
Hi Ramsay, On Fri, 4 May 2018, Ramsay Jones wrote: > On 03/05/18 21:25, Johannes Schindelin wrote: > > > On Thu, 3 May 2018, Ramsay Jones wrote: > > >> On 03/05/18 16:30, Johannes Schindelin wrote: > [snip] > > >>> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c > >>> new file mode

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Duy Nguyen
On Thu, May 3, 2018 at 10:32 PM, Johannes Schindelin wrote: > Hi Duy, > > On Thu, 3 May 2018, Johannes Schindelin wrote: > >> On Thu, 3 May 2018, Duy Nguyen wrote: >> >> > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin >> > wrote: >> >

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Junio C Hamano
Johannes Schindelin writes: > So please: as soon as you have a concrete suggestion where to use cyan > (and preferably even a DIFF_* constant to feed to diff_get_color_opt()), I > will be more than interested. I do not think Stefan's comment was that he was keen to

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Eric Sunshine
On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin wrote: > This builtin does not do a whole lot so far, apart from showing a usage > that is oddly similar to that of `git tbdiff`. And for a good reason: > the next commits will turn `branch-diff` into a full-blown

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Ramsay Jones
On 03/05/18 21:25, Johannes Schindelin wrote: > On Thu, 3 May 2018, Ramsay Jones wrote: >> On 03/05/18 16:30, Johannes Schindelin wrote: [snip] >>> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c >>> new file mode 100644 >>> index 000..97266cd326d >>> --- /dev/null >>> +++

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
Hi Stefan, On Thu, 3 May 2018, Stefan Beller wrote: > On Thu, May 3, 2018 at 1:42 PM, Johannes Schindelin > wrote: > > >> Speaking of colors, for origin/sb/blame-color Junio hinted at re-using > >> cyan for "uninteresting" parts to deliver a consistent color scheme

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Stefan Beller
On Thu, May 3, 2018 at 1:42 PM, Johannes Schindelin wrote: >> Speaking of colors, for origin/sb/blame-color Junio hinted at re-using >> cyan for "uninteresting" parts to deliver a consistent color scheme for >> Git. Eventually he dreams of having 2 layers of

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
Hi Stefan, On Thu, 3 May 2018, Stefan Beller wrote: > On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin > wrote: > > This builtin does not do a whole lot so far, apart from showing a > > usage that is oddly similar to that of `git tbdiff`. And for a good > >

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
Hi Duy, On Thu, 3 May 2018, Johannes Schindelin wrote: > On Thu, 3 May 2018, Duy Nguyen wrote: > > > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin > > wrote: > > > diff --git a/command-list.txt b/command-list.txt > > > index a1fad28fd82..c89ac8f417f 100644 > >

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
Hi Duy, On Thu, 3 May 2018, Duy Nguyen wrote: > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin > wrote: > > diff --git a/command-list.txt b/command-list.txt > > index a1fad28fd82..c89ac8f417f 100644 > > --- a/command-list.txt > > +++ b/command-list.txt > > @@

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
Hi Ramsay, On Thu, 3 May 2018, Ramsay Jones wrote: > On 03/05/18 16:30, Johannes Schindelin wrote: > > This builtin does not do a whole lot so far, apart from showing a usage > > that is oddly similar to that of `git tbdiff`. And for a good reason: > > the next commits will turn `branch-diff`

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Stefan Beller
Hi Johannes, On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin wrote: > This builtin does not do a whole lot so far, apart from showing a usage > that is oddly similar to that of `git tbdiff`. And for a good reason: > the next commits will turn `branch-diff` into a

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Duy Nguyen
On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin wrote: > diff --git a/command-list.txt b/command-list.txt > index a1fad28fd82..c89ac8f417f 100644 > --- a/command-list.txt > +++ b/command-list.txt > @@ -19,6 +19,7 @@ git-archive

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Ramsay Jones
On 03/05/18 16:30, Johannes Schindelin wrote: > This builtin does not do a whole lot so far, apart from showing a usage > that is oddly similar to that of `git tbdiff`. And for a good reason: > the next commits will turn `branch-diff` into a full-blown replacement > for `tbdiff`. > > At this

[PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Johannes Schindelin
This builtin does not do a whole lot so far, apart from showing a usage that is oddly similar to that of `git tbdiff`. And for a good reason: the next commits will turn `branch-diff` into a full-blown replacement for `tbdiff`. At this point, we ignore tbdiff's color options, as they will all be