[ANN][PLUGIN] graphical diff using kompare

Michael Ellerman michael at ellerman.id.au
Wed Apr 26 02:54:56 BST 2006


On 4/26/06, Stephen Ward <sward.dev at verizon.net> wrote:
> Hi,
>
> Following in the footsteps of the vimdiff plugin, I've added a new plugin to
> use the KDE 'kompare' tool for graphical diffs.   This version supports
> recursive diffs, and by default it compares the whole working tree against
> the basis tree.  Examples include:
>
> bzr kompare                         # diff the whole tree
> bzr kompare .                       # recursive diff from current directory
> bzr kompare -r last:5 FILE          # diff FILE against revision -5
> bzr kompare -r 3..5 FILE            # diff revisions 3..5 of FILE
> bzr kompare main dev                # diff two directories (or branches)

That looks pretty cool. It looks like a bunch of that logic could be
abstracted out from being kompare-specific and be useful for a more
generic plugin.

So instead of needing a
kompare/xdiff/fldiff/xxdiff/tkdiff/kdiff3/mgdiff/meld/etc. plugin, we
could just have a "guidiff" plugin which knows about all of the above
and can be configured to use the user's favourite.

cheers




More information about the bazaar mailing list