Author Topic: DIFFZilla as gitk's external diff viewer  (Read 4843 times)

gwoods

  • Junior Community Member
  • Posts: 7
  • Hero Points: 1
DIFFZilla as gitk's external diff viewer
« on: July 12, 2010, 10:29:31 pm »
DIFFZilla fails to properly handle gitk's temporary files format.  It seems to dislike the [ and ] characters.

gitk's external diff viewer format:
http://kerneltrap.org/mailarchive/git/2008/3/24/1240654

SlickEdit Info:
SlickEdit Version 15.0.0.6
Build Date: May 07, 2010
Emulation: CUA
OS: Linux
OS Version: Red Hat Enterprise Linux Client release 5.3 (Tikanga)
Kernel Level: 2.6.18-128.1.10.el5PAE
Build Version: #1 SMP Wed Apr 29 14:24:53 EDT 2009
Memory: 63% Load, 1254MB/1964MB Virtual
Shell Info: /apps/slickedit_15/bin/secsh -i
Screen Size: 3200 x 1200
Project Type: cpp
Language: .cpp (C/C++)
Hotfixes:
/users/username/.slickedit/15.0.0/hotfixes/hotfix_se1500_7_cumulative.zip (Revision: 7)



ScottW, VP of Dev

  • Senior Community Member
  • Posts: 1471
  • Hero Points: 64
Re: DIFFZilla as gitk's external diff viewer
« Reply #1 on: July 13, 2010, 03:35:11 pm »
Can you post a sample file that demonstrates this problem?

gwoods

  • Junior Community Member
  • Posts: 7
  • Hero Points: 1
Re: DIFFZilla as gitk's external diff viewer
« Reply #2 on: July 13, 2010, 05:52:25 pm »
DIFFZilla will report "No Files match these parameters" when this following diff is attempted.

vsdiff -r1 -r2 "[revisionindex] basefile1.ext" "[revisionindex] basefile2.ext"

- Greg

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2744
  • Hero Points: 145
Re: DIFFZilla as gitk's external diff viewer
« Reply #3 on: July 15, 2010, 01:24:47 pm »
This problem has to do with the fact '[' and ']' are actually wildcard characters on UNIX.  This was not being handled quite right for vsdiff.

This will be fixed in 15.0.1.

gwoods

  • Junior Community Member
  • Posts: 7
  • Hero Points: 1
Re: DIFFZilla as gitk's external diff viewer
« Reply #4 on: July 15, 2010, 08:20:18 pm »
Good news.  Thanks for the help.
- Greg