On Fri, Jul 5, 2013 at 10:51 PM, Joel Bruick j...@joelface.com wrote:
Hi all,
I've committed a pretty big changeto the diff code(http://www.fossil-scm.*
*org/index.html/info/4081a91c84http://www.fossil-scm.org/index.html/info/4081a91c84
**) , and I'd like some other people to take a look at it/test it out
before it (maybe/hopefully) gets merged into the trunk.
I've tested the web UI in Firefox/Chrome/IE (including IE8) and diff --tk
on Windows 7 (Tcl 8.6) and Linux (8.4, 8.5). If there's anything I need to
change to get this accepted into the trunk, let me know.
I've made a few minor tweaks and am using the sbsreloaded branch
internally. If it works out, I'd like to eventually merge it. I'm
thinking a few more tweaks to the --tk option might be desirable first,
though. I miss the ability to see all of the changes all at once, for
example.
Meanwhile, I have a related idea which I would like to submit to the
community, with the hope of enticing someone to do the implementation. (If
nobody steps forward, I will probably get around to doing this someday
myself - when I get a chance.)
I want a button on the --tk diff display that will do the following:
(1) Prompt for a filename
(2) Write into the named file a complete Tcl script that will recreate
the same side-by-side diff display, but on a machine that does not have the
current repository or even Fossil installed. Call this generated TCL
script a difference document.
Note that the current --tk implementation is a small script that
recursively invokes Fossil to get the difference information it needs.
That would not be appropriate for the generated difference document. The
generated difference document needs to have all the difference information
embedded.
This feature would allow me, for example, to email side-by-side diffs to
collaborators, even when the documents being diffed have not been checked
in and are not directly available to the collaborators.
Most developers currently collaborate by creating a unified or context diff
(a.k.a. a patch) and emailing that. But it would be more useful in some
contexts to be able to email a side-by-side diff.
This seems like a great getting-started project for someone who wants to
get involved with Fossil since it is well isolated and does not require any
understanding of how the rest of Fossil works. All that is required is to
convert the current TCL script generated by the --tk option into a
self-replicating script.
If you want to get really fancy, you might look into ways of adding another
button that will generate a patch from the side-by-side diff. So after
sharing a side-by-side diff via email, the developer on the other end can
generate a patch used to apply the change simply by clicking a button.
--
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
