Re: [Monotone-devel] Quick poll: Does anybody actually still use diff with --external?

[Thomas Keller]

Am 08.01.11 14:54, schrieb CooSoft Support:
> Works + spanner spring to mind with my reply :-)
> 
> Personally I couldn't care less that the au diff command doesn't have
> the --external option and I have never thought it inconsistent as one
> would only use it via some other tool like mtn-browse and if you wanted
> to use say kompare or kdiff3 then it is easy enough for something like
> mtn-browse to do that by fetching the files and doing it manually
> (mtn-browse actually does that).
> 
> However on the ordinary mtn diff command I do have --external set up to
> use kompare and that can prove very useful when comparing complex
> unchecked in changes made inside a workspace. Easily got round with a
> script though, automating what Stephen suggested, so certainly not `a
> must have'.
> 
> But I must admit I don't see the connection between the question and the
> diff sort order. Wouldn't diff be called per file so isn't it just the
> file order that needs sorting first? Also how does removing it make
> things faster?

I don't say its impossible to do, but it would require quite a lot more
code shuffling. If you look at the actual implementation in
cmd_diff_log.cc, around line 120, you see that we have to keep quite a
lot of state during a potential "first" round in order to sort things
before we go on with the "second" round which calculates and outputs the
actual diff.

In the end I'm just up for fixing this one bug, issue 102, so if you
think there is an easier / better way to do it, be my guest :)

Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature