[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: TortoiseMerge line breaks request

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Fri, 6 May 2011 07:19:30 +0000

>>> I thought about it. It is quite hard question even it does not looks like.
>>> There is split line you can move. You are saying that when you make left
>>> view narrow and right wide the small one wins (in term of number of
>>> chars per line)?
>> Hmm. Good question. I would spontaneously suggest to disable the splitter
>> and fix it at 50% when "Wrap long lines" is enabled.
> I have started feature request as you have seen

I ment to force it to 50%, disabling the possibility to change it when in line-wrap-mode: To prevent strange diffs. But I guess this could be OK as well. But it will probably lead to more edge cases to fix along the way.

>> Another suggestion would be to just make the whole line-wrapped block
>> behave as a single block when it comes to the diff. That is, show the
>> all the lines that makes up the wrapped lines as changed, if any part
>> of the lines is changed. Not as useful or elegant, but it's a
>> possibility...
> Sorry don't get what you mean ... Is it not like today ?

No. Let's say that I have a single long line that is being wrapped into five new lines. Today each of those five lines will be handled independently by TortoiseMerge when it comes to color coding. I would then suggest to color code all five lines as a whole, since they are part of the same line.

However: This would give less information than fixing at 50% and leaving the color coding as today...

>>>> In addition, I think it would be good if TortoiseMerge could try to
>>>> make the visualization of broken lines more readable by considering
>>>> inline difference information (that we already have) when deciding
>>>> where to break the line.
>>> Sounds good, however if you add one char - that char should take line?
>> No. I think that there should be a minimum length requirement. Perhaps
>> 50% of the line width or so.
...
> Kind of, let say you rename VeryLongVariableName into i then every
> ocurance of this diff shift text in one line. So after few changes lines
> are in offset even more then 100 chars, effectively looking like you
> look on two totaly differnent lines ...

Maybe we could have a user selectable minimum length requirement. Having a reasonable default would give good results most of the time, and for the other cases one could increase/decrease the minlength to get each actual change on a single line.

> However don't see any real way how to make it better while keep readability.

To me it seems like the in-line diff does an excellent job of analyzing the changes in a single line. It's just a matter of bringing that information into play when breaking long lines and I think we will get excellent readability of them as well.

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2731990

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-06 09:19:43 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.