[PATCH] extdiff: single file diffs from the wc without making a copy

Benoit Boissinot bboissin at gmail.com
Mon Aug 6 05:10:21 CDT 2007


On 8/6/07, Brad Schick <brad at schicks.net> wrote:
> # HG changeset patch
> # User Brad Schick <schickb at gmail.com>
> # Date 1186375074 25200
> # Node ID 54e960401474f64445e35351be1590782bbd7c6e
> # Parent  8d9bdcbb2b1852d2507cbb7e5d922f549f73f19d
> extdiff: single file diffs from the wc without making a copy
>
> Extdiff was always making a temporary directory and copying files even
> when not required. This change makes extdiff avoid the copy when diffing
> a single file that lives in the wc. This lets external diff tools edit
> the working copy file directly. It also lets other extensions resuse the
> functions in extdiff and get in-place diffs.
>
> Also exposed nest functions, made extdiff less chatty in non-verbose
> mode, and updated tests.
>
Can you split the patch for the different changes (you can use
patchbomb to mail the series) ?

something like:
- un-nest (what was the reason for this ?)
- makes less chatty
- use in place diff

Please update the tests in each patch, so the testsuite runs fine.

(btw the patch is line wrapped, maybe you can use patchbomb or if you
can't configure your mail client, attach the patch).

thanks,

Benoit


More information about the Mercurial-devel mailing list