Author Topic: vsdiff command line changes in V19  (Read 942 times)

warnerrs

  • Senior Community Member
  • Posts: 115
  • Hero Points: 4
vsdiff command line changes in V19
« on: October 02, 2014, 03:18:36 pm »
I'm using a vsdiff command like this to do a multi-file diff that excludes some hidden files, backup files, .SYNC folders.

This command worked on V18:
vsdiff -x '.*;*~;#*;.SYNC/' /tmp/ryanw.sldiff.24421/ $STX_COMLIB/

However, I have to use the following on V19:
vsdiff -wc '' -x '.*;*~;#*' -x'.SYNC/' /tmp/ryanw.sldiff.24421/ $STX_COMLIB/

Two things here:
On V18, the -wc wasn't required to engage multi-file diff. On V19, if you don't use -wc it does single file diff regardless of what you passed to it.
On V18, the -x option would accept file patterns and directory patterns in a single option. In V19, I have to separate the excluded directory from the excluded file patterns.

warnerrs

  • Senior Community Member
  • Posts: 115
  • Hero Points: 4
Re: vsdiff command line changes in V19
« Reply #1 on: October 02, 2014, 03:26:54 pm »
Beta6

vsdiff -wc '' -x '.*;*~;#*' -x'.SYNC/' /tmp/ryanw.sldiff.24421/ $STX_COMLIB/

That command is performing the diff I want, but path 2 ($STX_COMLIB) is in read-only mode. I didn't use the -r1 or -r2 switch. Actually tried using both -r1 and -r2, and they didn't have any affect. path 1 was always editable, path 2 was always read-only.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 1794
  • Hero Points: 70
Re: vsdiff command line changes in V19
« Reply #2 on: October 02, 2014, 03:29:22 pm »
For multi-file diff the -r1 and -r2 won't affect it.

I'm not sure why path 2 is not editable.  Are there any obvious permission issues?

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 1794
  • Hero Points: 70
Re: vsdiff command line changes in V19
« Reply #3 on: October 02, 2014, 04:23:41 pm »
I'm using a vsdiff command like this to do a multi-file diff that excludes some hidden files, backup files, .SYNC folders.

This command worked on V18:
vsdiff -x '.*;*~;#*;.SYNC/' /tmp/ryanw.sldiff.24421/ $STX_COMLIB/

However, I have to use the following on V19:
vsdiff -wc '' -x '.*;*~;#*' -x'.SYNC/' /tmp/ryanw.sldiff.24421/ $STX_COMLIB/

Two things here:
On V18, the -wc wasn't required to engage multi-file diff. On V19, if you don't use -wc it does single file diff regardless of what you passed to it.
On V18, the -x option would accept file patterns and directory patterns in a single option. In V19, I have to separate the excluded directory from the excluded file patterns.

I just tried your original command line from v18, changing the paths, and it seemed to work.  Are you on Beta 6?

warnerrs

  • Senior Community Member
  • Posts: 115
  • Hero Points: 4
Re: vsdiff command line changes in V19
« Reply #4 on: October 02, 2014, 04:39:50 pm »
yes beta 6. linux.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 1794
  • Hero Points: 70
Re: vsdiff command line changes in V19
« Reply #5 on: October 02, 2014, 07:42:36 pm »
What if you remove the -x options and simply do vsdiff path1/ path2/?

warnerrs

  • Senior Community Member
  • Posts: 115
  • Hero Points: 4
Re: vsdiff command line changes in V19
« Reply #6 on: October 02, 2014, 08:59:57 pm »
1. Command line arguments
It is recursive related. It doesn't recurse until I use -wc '*', then the requiring multiple -x thing crops up.
I've attached a testcase which includes my v18 command and the newly required v19 command.

2. read-only issue
It had switched to Source Diff. That was causing the read-only problem. Doesn't look like I can control that from the command line. Looks like it gets it from the configuration.




Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 1794
  • Hero Points: 70
Re: vsdiff command line changes in V19
« Reply #7 on: October 09, 2014, 06:25:55 pm »
Sorry for the slow reply.  I've been working on this and a few other things simultaneously.  It should always recurse, so I've fixed that.  The option to recurse will be +t, and -t will be to not recurse.  It's in the documentation, and I made sure that both of your test cases work.  Thanks for posting them.