Hi all,
I've been a paid member of the TextMate-o-sphere for a couple months now, but have just started dipping into its mighty goodness. One thing that I've found that is not quite so good is how the subversion plugin won't play nice with colordiff.
In my .subversion/config, I've set it up to use colordiff instead of diff. I do a lot of my work from the command-line, so this is pretty important for me. Unfortunately, the subversion plugin doesn't like this. If you look here:
http://www.nuthole.com/img/tm_ss1.png
you'll see what I'm talking about. The upper half ("Untitled 705") shows the result of me doing a "Diff with Newest (HEAD)" with my preferred .subversion/config settings intact, while the lower half ("Untitled 706") shows the much prettier version that the subversion bundle does all on its own if I remove my settings.
Now, I'd just accept that "that's just the way it is", except for the fact that the bundles doesn't *always* do this. In particular, if I bring up an SVN Log from within TextMate, and then click on a link to see a diff in there, the resulting diff is displayed in a TextMate-colorized fashion, apparently ignoring my .subversion/config settings (hooray!). So what I wonder is, if the plugin can ignore my settings and do its own colorization in one case, why can't it do it all the time?
On 10 May 2007, at 09:49, Jack Nutting wrote:
So what I wonder is, if the plugin can ignore my settings and do its own colorization in one case, why can't it do it all the time?
You should be able to just set TM_SVN_DIFF_CMD to diff I think (In TextMate preferences). Using a diff which produces colours isn't ideal since as you can see you'll end up with garbage in the resulting text.
On 5/10/07, Ciarán Walsh ciawal@gmail.com wrote:
You should be able to just set TM_SVN_DIFF_CMD to diff I think (In TextMate preferences). Using a diff which produces colours isn't ideal since as you can see you'll end up with garbage in the resulting text.
Woohoo, that did it! Thanks a bunch. I still wonder why getting a diff from the log already did the right thing, but anyway this solves my current need.
On 10. May 2007, at 13:15, Jack Nutting wrote:
[...] I still wonder why getting a diff from the log already did the right thing, but anyway this solves my current need.
The log message says:
• status and log: ensure that 'diff' is used as the --diff-cmd and not user-set diff program from the subversion config
note: should probably be revised to use TM_SVN_DIFF_CMD instead
So they were intentionally fixed for the problem you experienced, but not in the preferred way :)
-
Allan Odgaard -
Ciarán Walsh -
Jack Nutting