Syntax highlighting for TortoiseMerge

288 views
Skip to first unread message

Sven Strickroth

unread,
Jul 26, 2015, 11:47:46 AM7/26/15
to d...@tortoisesvn.tigris.org
TorotiseBlame has syntax highlighting - what about implementing this also for TortoiseMerge?

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

To unsubscribe from this discussion, e-mail: [dev-uns...@tortoisesvn.tigris.org].

Stefan Küng

unread,
Jul 27, 2015, 12:33:39 PM7/27/15
to d...@tortoisesvn.tigris.org
On 26.07.2015 17:21, Sven Strickroth wrote:
> TorotiseBlame has syntax highlighting - what about implementing this also for TortoiseMerge?

Do you suggest to use scintilla for TMerge as well?
I've tried that once, but since scintilla is not designed for such a
purpose, it was too slow. Performance drop was mostly noticeable with
bigger files of course.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net

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

Yue Lin Ho

unread,
Dec 25, 2017, 4:33:48 AM12/25/17
to TortoiseSVN-dev
Stefan於 2015年7月28日星期二 UTC+8上午12時33分39秒寫道:
On 26.07.2015 17:21, Sven Strickroth wrote:
> TorotiseBlame has syntax highlighting - what about implementing this also for TortoiseMerge?

Do you suggest to use scintilla for TMerge as well?
I've tried that once, but since scintilla is not designed for such a
purpose, it was too slow. Performance drop was mostly noticeable with
bigger files of course.


Tried SCI_GETDIRECTFUNCTION?

Yue Lin
 

Stefan

unread,
Dec 25, 2017, 5:09:13 PM12/25/17
to TortoiseSVN-dev
That's not the reason for the performance problem.
And yes: I'm using Scintilla in a few other places as well, and always with the direct function.

Stefan

Yue Lin Ho

unread,
Dec 25, 2017, 8:12:18 PM12/25/17
to TortoiseSVN-dev


Stefan於 2017年12月26日星期二 UTC+8上午6時09分13秒寫道:
On Monday, December 25, 2017 at 10:33:48 AM UTC+1, Yue Lin Ho wrote:
Tried SCI_GETDIRECTFUNCTION?
That's not the reason for the performance problem.

Could you please tell me where the real performance problem is? :)

Yue Lin

Stefan

unread,
Dec 29, 2017, 2:55:04 AM12/29/17
to TortoiseSVN-dev


On Tuesday, December 26, 2017 at 2:12:18 AM UTC+1, Yue Lin Ho wrote:

Could you please tell me where the real performance problem is? :)

TMerge shows the content line-by-line which is fast even for big files.
Scintilla doesn't do that but always handles the whole file - it has to because of the lexing. Imagine a "/*" at the top of a 10MB text file and one "*/" at the end. If you show the middle of the file, Scintilla has to handle the whole file to recognize that even that part is commented.

You can try it yourself if you like.

Yue Lin Ho

unread,
Dec 30, 2017, 6:37:59 AM12/30/17
to TortoiseSVN-dev


Stefan於 2017年12月29日星期五 UTC+8下午3時55分04秒寫道:
Thanks Stefan! :)

Yue Lin

 
Reply all
Reply to author
Forward
0 new messages