Re: [dev] [sbase] diff

2016-02-21 Thread Mattias Andrée
On Sun, 21 Feb 2016 20:16:48 +0100 Mattias Andrée wrote: > On Thu, 28 Jan 2016 16:48:22 +0100 > Markus Wichmann wrote: > > > The two files to be compared are loaded into memory, > > whereby each line is annotated with its line number > > (actually, that's a lie, busybox only saves a hash of > >

Re: [dev] [sbase] diff

2016-02-21 Thread Mattias Andrée
On Thu, 28 Jan 2016 16:48:22 +0100 Markus Wichmann wrote: > The two files to be compared are loaded into memory, > whereby each line is annotated with its line number > (actually, that's a lie, busybox only saves a hash of the > line and really, really hopes, there are no collisions, > but hush).

Re: [dev] [sbase] diff

2016-01-31 Thread Marc André Tanner
On Thu, Jan 28, 2016 at 04:48:22PM +0100, Markus Wichmann wrote: > Comments? I'm not really up to date with all the different algorithms and haven't looked at the code, but for source code i.e. patches the Patience diff "pre-processing" seems to have some desirable properties: http://bramcohen.

Re: [dev] [sbase] diff

2016-01-28 Thread Mattias Andrée
I have trimmed down the memory usable a little but, but not reduce the space complexity. (Reduced by 80 % on 32-bit machines, and 88.(8) % on 64-bit machines, as the supreium.) If I understood that algorithm correct, I do not think it will produce the optimal result (I have not look in to it tough

Re: [dev] [sbase] diff

2016-01-28 Thread Mattias Andrée
On Thu, 28 Jan 2016 16:48:22 +0100 Markus Wichmann wrote: > On Wed, Jan 27, 2016 at 11:22:55PM +0100, Mattias Andrée > wrote: > > Perhaps I should describe how the program works > > (although it is very simple.) The documents are > > compared just like of they were words, but with > > lines rathe

Re: [dev] [sbase] diff

2016-01-28 Thread Markus Wichmann
On Wed, Jan 27, 2016 at 11:22:55PM +0100, Mattias Andrée wrote: > Perhaps I should describe how the program works > (although it is very simple.) The documents are > compared just like of they were words, but with > lines rather than characters, and only add and > remove are valid changes, not subs

Re: [dev] [sbase] diff

2016-01-27 Thread Mattias Andrée
Nice, I did not know about that. I have removed the macro in my branch, I will submitted when other suggestions have been implemented, assuming any are suggested. Perhaps I should describe how the program works (although it is very simple.) The documents are compared just like of they were words,

Re: [dev] [sbase] diff

2016-01-27 Thread FRIGN
On Wed, 27 Jan 2016 20:18:17 +0100 Mattias Andrée wrote: Hey Mattias, thanks for your patch. I haven't looked at it in-depth, but would like to advise you instead of using this macro-beast: > +#define printf(...) do {if (printf(__VA_ARGS__) < 0) perror("printf"), > exit(EXIT_FAILURE); } whil

[dev] [sbase] diff

2016-01-27 Thread Mattias Andrée
The beginning of an implementation of diff. It only does the bare essentials, and it is not usable implemention of diff yet. Signed-off-by: Mattias Andrée --- LICENSE | 1 + Makefile | 1 + diff.c | 207 +++ 3 files changed, 209