difftastic icon indicating copy to clipboard operation
difftastic copied to clipboard

Add options which allows us to use difft as Apache Subversion's external diff tool

Open futatuki opened this issue 2 years ago • 9 comments

svn, Apache Subversion's command line client also has option to use external diff tool for svn diff subcommand. However it assumes that diff tool has diff compatible -L (label) and -u option.

This implements -L and -u options.

futatuki avatar Aug 26 '23 15:08 futatuki

Neat, it'd be nice to have svn support.

I'm OK with adding label options, but I don't like having multiple ways of setting the display mode.

Could we support this syntax similar to git support? If it's always the same arguments in the same order, we could allow those arguments without allowing -u in all circumstances.

Wilfred avatar Aug 26 '23 21:08 Wilfred

Thank you for being interested in this PR.

-u option is passed only if the user does not specify any additional options. This is done by svn_io_run_diff2() C API function. In the case, -u options is always the first argument, 0 - 2 -L LABEL options is followed and then finally 2 paths, however this order is not documented.

How about hiding -u option from help and just ignore it in the argment processing ?

futatuki avatar Aug 26 '23 23:08 futatuki

I'd be interested!

bmarwell avatar Dec 19 '23 19:12 bmarwell

@futatuki can you rebase your diff, please?

bmarwell avatar Mar 13 '24 09:03 bmarwell

Yes, I'm willing to do later, with pleasure.

futatuki avatar Mar 13 '24 09:03 futatuki

Yes, I'm willing to do later, with pleasure.

Thanks! I am using your patch, it is really helpful. I hope @Wilfred sees this in time and can maybe integrate it :)

bmarwell avatar Mar 13 '24 11:03 bmarwell

Rebase done.

futatuki avatar Mar 13 '24 12:03 futatuki