Re: [fossil-users] Side-by-side diff and non-English text
On Mon, 4 Mar 2013, Jan Nijtmans wrote: 2013/3/4 Jan Nijtmans jan.nijtm...@gmail.com: It still isn't correct in all cases. See: https://www.fossil-scm.org/index.html/info/256815f9c5 I see that's fixed now too. Thanks Richard! (not visible on fossil-scm.org yet, until it's fossil version is upgraded) It seems for me I reached the limit of request for the Subject, :-) Nevertheless, I would venture http://91.208.39.24:8080/lipsum It is under 'now-trunk'. Right side http://91.208.39.24:8080/lipsum/vdiff?from=16acb2846d84b028to=6a58f2dd9ada9a81 Left side http://91.208.39.24:8080/lipsum/vdiff?from=6a58f2dd9ada9a81to=8b0984ab46648f58 May be it is not possible to manage all cases? In any case thanks for all previous workarounds! Sergei Regards, Jan Nijtmans ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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 and non-English text
On Thu, 28 Feb 2013, Richard Hipp wrote: On Thu, Feb 28, 2013 at 4:20 AM, Jan Nijtmans jan.nijtm...@gmail.com wrote: 2013/2/28 Sergei Gavrikov sergei.gavri...@gmail.com: On Wed, 27 Feb 2013, Joe Mistachkin wrote: Do you have an example that is viewable online? Find, please, a test http://chiselapp.com/user/sg/repository/pangrams Look at side-by-side diff views from 2nd to 3rd check-in and from 3rd to 4th. It looks like the span class=diffrm, which is inserted, is dropped in the middle of a 2-byte UTF-8 character, splitting it in two invalid characters. That should never be done! Fixed here: http://www.fossil-scm.org/fossil/info/e2b3490676 Thank you. Unfortunately, splitting did not go away. As chiselapp.com has not got this workaround yet, I created two test repositories (Lorem Ipsum in Greek and Russian, UTF-8 encoded): (1) https://chiselapp.com/user/sg/repository/lipsum (2) http://91.208.39.24:8080/lipsum The second service is managed by the latest Fossil (+ e2b3490676) Please, compare results https://chiselapp.com/user/sg/repository/lipsum/vdiff?from=8b0984ab46648f58to=121bf8035b966861 http://91.208.39.24:8080/lipsum/vdiff?from=8b0984ab46648f58to=121bf8035b966861 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 and non-English text
On Sat, Mar 02, 2013 at 08:01:33PM +0300, Sergei Gavrikov wrote: On Thu, 28 Feb 2013, Richard Hipp wrote: On Thu, Feb 28, 2013 at 4:20 AM, Jan Nijtmans jan.nijtm...@gmail.com wrote: 2013/2/28 Sergei Gavrikov sergei.gavri...@gmail.com: On Wed, 27 Feb 2013, Joe Mistachkin wrote: Do you have an example that is viewable online? Find, please, a test http://chiselapp.com/user/sg/repository/pangrams Look at side-by-side diff views from 2nd to 3rd check-in and from 3rd to 4th. It looks like the span class=diffrm, which is inserted, is dropped in the middle of a 2-byte UTF-8 character, splitting it in two invalid characters. That should never be done! Fixed here: http://www.fossil-scm.org/fossil/info/e2b3490676 Thank you. Unfortunately, splitting did not go away. As chiselapp.com has not got this workaround yet, I created two test repositories (Lorem Ipsum in Greek and Russian, UTF-8 encoded): (1) https://chiselapp.com/user/sg/repository/lipsum (2) http://91.208.39.24:8080/lipsum The second service is managed by the latest Fossil (+ e2b3490676) Please, compare results https://chiselapp.com/user/sg/repository/lipsum/vdiff?from=8b0984ab46648f58to=121bf8035b966861 http://91.208.39.24:8080/lipsum/vdiff?from=8b0984ab46648f58to=121bf8035b966861 Sergei Chiselapp is a third party service and uses the latest stable fossil. I don't really have the time to give it the attention it needs and have been debating shutting it down. -- James Turner ___ 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 and non-English text
On Wed, 27 Feb 2013, Joe Mistachkin wrote: Sergei Gavrikov wrote: Has anyone seen a broken output on the side-by-side diff pages for non-English texts? Do you have an example that is viewable online? Find, please, a test http://chiselapp.com/user/sg/repository/pangrams Look at side-by-side diff views from 2nd to 3rd check-in and from 3rd to 4th. For example http://chiselapp.com/user/sg/repository/pangrams/fdiff?v1=edab872a806e8d4cv2=6936fca46ff9d180 Left-side hunk: 30 Right-side hunks: 29, 81, 126, 137 Of course, unified diff has no such quirks. If such an issue exists and it is a limitation the sbs's algorithm, what do you think, Is it good idea to add new Fossil setting to manage the default behavior the sbs for vdiff, fdiff, and time-line's on-click events, i.e. set sbs=1 or sbs=0 by a request/setting? Personally, I think it might be nice to have such a setting, even if the side-by-side diff works perfectly for all cases. For now, I patch only 4-lines to get sbs=0 by default info.c |6 +++--- timeline.c |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) But perhaps, I missed other places. Sergei -- Joe Mistachkin ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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 and non-English text
On 28-2-2013 9:33, Sergei Gavrikov wrote: For example http://chiselapp.com/user/sg/repository/pangrams/fdiff?v1=edab872a806e8d4cv2=6936fca46ff9d180 Left-side hunk: 30 Right-side hunks: 29, 81, 126, 137 Of course, unified diff has no such quirks. It looks like the side-by-side diff algorithm isn't UTF-8-aware, and looks at the text byte-for-byte. Consequently, it may detect a difference in the second byte of a multi-byte character, and start marking a difference right in the middle of that character. The result is an invalid single-byte character, followed by an HTML tag, followed by another (possibly also invalid) single-byte character. The same could happen at the end of a different sequence, of course, if the first byte is different but the second identical. If fossil knows that a text is UTF-8-encoded, the diff algorithm should ideally compare characters (which may span multiple bytes), and not bytes. Adding a setting indicating a default diff would perhaps be easier, in the short term. :-) -- Martijn Coppoolse ___ 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 and non-English text
On Thu, Feb 28, 2013 at 4:20 AM, Jan Nijtmans jan.nijtm...@gmail.comwrote: 2013/2/28 Sergei Gavrikov sergei.gavri...@gmail.com: On Wed, 27 Feb 2013, Joe Mistachkin wrote: Do you have an example that is viewable online? Find, please, a test http://chiselapp.com/user/sg/repository/pangrams Look at side-by-side diff views from 2nd to 3rd check-in and from 3rd to 4th. It looks like the span class=diffrm, which is inserted, is dropped in the middle of a 2-byte UTF-8 character, splitting it in two invalid characters. That should never be done! Fixed here: http://www.fossil-scm.org/fossil/info/e2b3490676 Regards, Jan Nijtmans ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- 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
[fossil-users] Side-by-side diff and non-English text
Hi Has anyone seen a broken output on the side-by-side diff pages for non-English texts? I mean UTF-8 non-English texts (Russian in my case) and of course the latest Fossil builds. If such an issue exists and it is a limitation the sbs's algorithm, what do you think, Is it good idea to add new Fossil setting to manage the default behavior the sbs for vdiff, fdiff, and time-line's on-click events, i.e. set sbs=1 or sbs=0 by a request/setting? As I could see sbs=1 is default behavior for vdiff and fdiff. Or may be I did miss some setting?! If I did, please, share a hint here. Thanks, Sergei ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
