enable editing or reverting resp. in hg extdiff

Brad Schick schickb at gmail.com
Mon Aug 6 15:07:45 CDT 2007


Georg wrote:
> Hi,
>
> The problem is that hg extdiff creates temp files for all file
> versions before firing off the external diff tool.  I realize that
> this is a good thing in general, because many tools (also meld) will
> show a directory tree first, and having only changed files contained
> in that tree makes it much easier to navigate. I thought, however,
> that maybe we could have symlinks for those file versions that are
> from the current directory tree.  
This is one of the first questions I asked when starting with mercurial
as well, since I follow the same commit process as you mentioned.
Windows does have hard-links but I'm not sure how well that is exposed
by Python libraries. Might be worth investigating.

I'm actively working on another solution that has two parts: First, I'm
making a patch for extdiff that avoids the copy when diffing a single
file that lives in the wc. Second, I'm creating graphical commit and
status dialogs that understand hg and only show what you ask them to
show. The dialogs then use the modified extdiff to launch a diff tool to
compare the file in place (when possible).

Screenshot to give you an idea:
http://www.robotbattle.com/images/gcommit.png
http://www.robotbattle.com/images/gstatus.png


-Brad


More information about the Mercurial mailing list