Re: [fossil-users] Side-by-side diff improvement
On Tue, Jul 09, 2013 at 06:46:48PM -0400, Richard Hipp wrote: On Fri, Jul 5, 2013 at 10:51 PM, Joel Bruick [1]j...@joelface.com wrote: Hi all, I've committed a pretty big changeto the diff code([2]http://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. [snip] I've test the sbsreload branch and it work very nice for me.. especially when using the --tk flag, where all files are in the same window. But to test some limits, I tried the following command against the fossil repository: fossil diff --tk --from aaa8e45b36 Which is a diff from about 300 commits ago to have a big diff with a lot of files. In that case, the file menu on top doesn't work, it only show what fit on my screen and doesn't allow to scroll because when I release the mouse button, the menu diseappear. Hope this will help to improve this improvement.. -- Martin G. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
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
Re: [fossil-users] Side-by-side diff improvement
Was away from the computer all day yesterday. Thanks to everyone for the feedback so far. I really appreciate it. Stephan Beal wrote: Tab/shift-tab for me iterates through all the links on the page? Yeah, that only works with 'fossil diff --tk'. Sorry for the confusion. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
Lluís Batlle i Rossell wrote: I still have to test this scrollbar proposal (I don't like much scrollbars inside windows which already have scrollbars...), but at least it goes into a good direction. Heh, I'm with you 99% of the time on excessive scrollbar hatred, but for this situation I think it's really the best way to do it. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On Sun, Jul 07, 2013 at 11:49:56AM -0400, Joel Bruick wrote: Lluís Batlle i Rossell wrote: I still have to test this scrollbar proposal (I don't like much scrollbars inside windows which already have scrollbars...), but at least it goes into a good direction. Heh, I'm with you 99% of the time on excessive scrollbar hatred, but for this situation I think it's really the best way to do it. It's the style used by meld and those very useful programs, at least. :) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On Sat, Jul 6, 2013 at 4:51 AM, Joel Bruick j...@joelface.com wrote: The purpose of this commit is, as the commit message says, to support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. Here's an example of it in action on a test copy of the Fossil repo: http://joelface.com/fossil/**fdiff?v1=98aec3c55155011bv2=** d74d0c320c455abdsbs=1(youhttp://joelface.com/fossil/fdiff?v1=98aec3c55155011bv2=d74d0c320c455abdsbs=1(youcan click anywhere inside a diff and use the left/right arrow keys to scroll) Looks very nice :) The diff --tk code also needed to be updated to support the new HTML output, and, well, I probably overdid it. I think it's really nice, though, so I hope you'll give it a try. (Tip: tab/shift-tab cycles through files.) Tab/shift-tab for me iterates through all the links on the page? -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On 07/06/13 04:51, Joel Bruick wrote: [---] The purpose of this commit is, as the commit message says, to support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. Here's an example of it in action on a test copy of the Fossil repo: http://joelface.com/fossil/fdiff?v1=98aec3c55155011bv2=d74d0c320c455abdsbs=1(you can click anywhere inside a diff and use the left/right arrow keys to scroll) I instantly can't live without it. -- Kind regards, Jan Danielsson signature.asc Description: OpenPGP digital signature ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On Fri, 5 Jul 2013, Joel Bruick wrote: Hi all, I've committed a pretty big changeto the diff code(http://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. The purpose of this commit is, as the commit message says, to support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. Here's an example of it in action on a test copy of the Fossil repo: http://joelface.com/fossil/fdiff?v1=98aec3c55155011bv2=d74d0c320c455abdsbs=1(you can click anywhere inside a diff and use the left/right arrow keys to scroll) Thank you! I looked for this for months. At the end, sbs diff does not break long UTF-8 lines http://91.208.39.24:8080/lipsum/vdiff?from=6a58f2dd9ada9a81to=8b0984ab46648f58sbs=1 New sbs diff engine with scroll bars looks great (tested on Linux: Firefox Google Chrome). I could not live without it. Sergei ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On Sat, Jul 06, 2013 at 02:34:38PM +0300, Sergei Gavrikov wrote: On Fri, 5 Jul 2013, Joel Bruick wrote: Hi all, I've committed a pretty big changeto the diff code(http://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. The purpose of this commit is, as the commit message says, to support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. Here's an example of it in action on a test copy of the Fossil repo: http://joelface.com/fossil/fdiff?v1=98aec3c55155011bv2=d74d0c320c455abdsbs=1(you can click anywhere inside a diff and use the left/right arrow keys to scroll) Thank you! I looked for this for months. At the end, sbs diff does not break long UTF-8 lines http://91.208.39.24:8080/lipsum/vdiff?from=6a58f2dd9ada9a81to=8b0984ab46648f58sbs=1 New sbs diff engine with scroll bars looks great (tested on Linux: Firefox Google Chrome). I could not live without it. In the 'annotate_links' branch, since many months there is a patch that does not break lines. For us it was inacceptable that a 'diff' could *hide* the differences, due to some forced wrap length. It mainly calculated the max line, and took it as the wrap length. I still have to test this scrollbar proposal (I don't like much scrollbars inside windows which already have scrollbars...), but at least it goes into a good direction. Thank you! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Side-by-side diff improvement
On Sat, Jul 6, 2013 at 2:05 PM, Lluís Batlle i Rossell vi...@viric.namewrote: I still have to test this scrollbar proposal (I don't like much scrollbars inside windows which already have scrollbars...), but at least it goes into a good direction. A few hours ago i would have agreed, but he's synchronized the side-scrolling of the diffs, which makes it quite comfortable. Just do Shift-mousewheel with your mouse over the diff. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Side-by-side diff improvement
Hi all, I've committed a pretty big changeto the diff code(http://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. The purpose of this commit is, as the commit message says, to support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. Here's an example of it in action on a test copy of the Fossil repo: http://joelface.com/fossil/fdiff?v1=98aec3c55155011bv2=d74d0c320c455abdsbs=1(you can click anywhere inside a diff and use the left/right arrow keys to scroll) The diff --tk code also needed to be updated to support the new HTML output, and, well, I probably overdid it. I think it's really nice, though, so I hope you'll give it a try. (Tip: tab/shift-tab cycles through files.) Neither the diff logic itself nor the plaintext diff output have been modified (if they have, it's a bug). There are also a few other minor changes to the web output: fixing non-compliant HTML (like div's inside pre's), making chunk fragment IDs not repeat on pages with multiple diffs, and simplifying diff error messages. 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. Thanks! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
