Re: [PATCH v4 11/21] range-diff: add tests
Stefan Beller writes: > On Mon, Jul 30, 2018 at 1:18 PM Junio C Hamano wrote: > >> > I already pushed an update to https://github.com/gitgitgadget/git/pull/1. >> >> Should I take "pushed to ... GGG" to mean "do not merge what you >> have to 'next' yet, as there will be an updated series (not >> incremental) being prepared"? > > Not speaking for Johannes, but I think that *could* work. I wasn't asking if it could or could not work. I was asking for his intentions. Not knowing it means I cannot merge the topic as-is merged to 'next' and have to wait just in case, but his not knowing my waiting would mean an update version may never come.
Re: [PATCH v4 11/21] range-diff: add tests
On Mon, Jul 30, 2018 at 1:18 PM Junio C Hamano wrote: > > I already pushed an update to https://github.com/gitgitgadget/git/pull/1. > > Should I take "pushed to ... GGG" to mean "do not merge what you > have to 'next' yet, as there will be an updated series (not > incremental) being prepared"? Not speaking for Johannes, but I think that *could* work. On the other hand full rerolls are more expensive to prep (at least for me, I guess GGG might change that) git range-diff gitgitgadget/pr/1...origin/js/range-diff shows there is * a different header guard: @@ -418,8 +419,8 @@ --- /dev/null +++ b/range-diff.h @@ -+#ifndef RANGE_DIFF_H -+#define RANGE_DIFF_H ++#ifndef BRANCH_DIFF_H ++#define BRANCH_DIFF_H + * another different header guard: @@ -239,8 +240,8 @@ --- /dev/null +++ b/linear-assignment.h @@ -+#ifndef LINEAR_ASSIGNMENT_H -+#define LINEAR_ASSIGNMENT_H ++#ifndef HUNGARIAN_H ++#define HUNGARIAN_H + although this one is the other way round. Did you squash in one header guard and Johannes fixed a header guard in a different file? With that said, I can send my series for more color testing and better diff.c code on top of either. (https://public-inbox.org/git/20180728030448.192177-1-sbel...@google.com/) Stefan
Re: [PATCH v4 11/21] range-diff: add tests
Johannes Schindelin writes: > On Sun, 22 Jul 2018, Eric Sunshine wrote: > >> On Sat, Jul 21, 2018 at 6:05 PM Thomas Rast via GitGitGadget >> wrote: >> > These are essentially lifted from https://github.com/trast/tbdiff, with >> > light touch-ups to account for the command now being names `git >> >> s/names/named/ > > Thanks. > > I already pushed an update to https://github.com/gitgitgadget/git/pull/1. Should I take "pushed to ... GGG" to mean "do not merge what you have to 'next' yet, as there will be an updated series (not incremental) being prepared"?
Re: [PATCH v4 11/21] range-diff: add tests
Hi Eric, On Sun, 22 Jul 2018, Eric Sunshine wrote: > On Sat, Jul 21, 2018 at 6:05 PM Thomas Rast via GitGitGadget > wrote: > > These are essentially lifted from https://github.com/trast/tbdiff, with > > light touch-ups to account for the command now being names `git > > s/names/named/ Thanks. I already pushed an update to https://github.com/gitgitgadget/git/pull/1. Ciao, Dscho > > > range-diff`. > > > > Apart from renaming `tbdiff` to `range-diff`, only one test case needed > > to be adjusted: 11 - 'changed message'. > > > > The underlying reason it had to be adjusted is that diff generation is > > sometimes ambiguous. In this case, a comment line and an empty line are > > added, but it is ambiguous whether they were added after the existing > > empty line, or whether an empty line and the comment line are added > > *before* the existing empty line. And apparently xdiff picks a different > > option here than Python's difflib. > > > > Signed-off-by: Johannes Schindelin >
Re: [PATCH v4 11/21] range-diff: add tests
> +test_expect_success 'simple B...C (unmodified)' ' > + git range-diff --no-color I wonder if we want to have tests for colors, too, eventually. (Feel free to push back on it or put it into the left over hashtag. But given how much time we (or I) spent discussing colors, this would be a welcome extension for the tests) Stefan
Re: [PATCH v4 11/21] range-diff: add tests
On Sat, Jul 21, 2018 at 6:05 PM Thomas Rast via GitGitGadget wrote: > These are essentially lifted from https://github.com/trast/tbdiff, with > light touch-ups to account for the command now being names `git s/names/named/ > range-diff`. > > Apart from renaming `tbdiff` to `range-diff`, only one test case needed > to be adjusted: 11 - 'changed message'. > > The underlying reason it had to be adjusted is that diff generation is > sometimes ambiguous. In this case, a comment line and an empty line are > added, but it is ambiguous whether they were added after the existing > empty line, or whether an empty line and the comment line are added > *before* the existing empty line. And apparently xdiff picks a different > option here than Python's difflib. > > Signed-off-by: Johannes Schindelin
