Subversion enhancements for your commandline

Jakob at Sun, 05 Apr 2009 00:58:52 +0200

Jakob — Sat, 04 Apr 2009 22:58:52 +0000

I just checked the files. Everything works fine here on my side with the files linked in the blog entry. The diff is done by colordiff. There are no escapesequences involved in the diffing example. At least not in the shell script ;). Manual colorcodes are only used for svn up and svn log. Maybe your less is configured to disallow colors? If you copied the contents of the file into your bashrc file, try to just add the line "source /path/to/svn/bashrc.txt" instead of the copied content. This way you can be sure the escapesequences haven't been messed up by your editor :) greetings, Jakob

Lukas at Thu, 02 Apr 2009 10:25:41 +0200

Lukas — Thu, 02 Apr 2009 08:25:41 +0000

Thx .. but it seems like there is some encoding issue now? I tried to fix all the ^[ by hand, but it still does not seem to work anymore (using svn diff, just gets me the normal svn diff).

Jakob at Wed, 01 Apr 2009 23:53:52 +0200

Jakob — Wed, 01 Apr 2009 21:53:52 +0000

@derek, @Lukas: I have updated both versions of the script, which should hopefully fix both of your problems :) greetings Jakob

Lukas at Wed, 01 Apr 2009 11:27:19 +0200

Lukas — Wed, 01 Apr 2009 09:27:19 +0000

Not being a bash expert I am not sure whats going on, but with this stuff enabled I can no longer use the "svn copy" command. I always get the following error message: "svn: Local, non-commit operations do not take a log message or revision properties"

derek at Fri, 27 Mar 2009 13:27:25 +0100

derek — Fri, 27 Mar 2009 12:27:25 +0000

I like the functionality added by this script, thanks! Unfortunately, it breaks a couple of things I like to be able to do, such as: svn ci -m "This is my log message." and svn rm this/is/a/path/with\ a/space\ in\ it

Jakob at Mon, 23 Mar 2009 22:14:32 +0100

Jakob — Mon, 23 Mar 2009 21:14:32 +0000

Thanks for the hint. I changed the scripts accordingly. greetings Jakob

Lukas at Mon, 23 Mar 2009 16:25:40 +0100

Lukas — Mon, 23 Mar 2009 15:25:40 +0000

It would also be great if it would pick the svn command from the PATH rather than hardcoding an absolute path to the svn command.

Georg at Tue, 17 Mar 2009 15:31:21 +0100

Georg — Tue, 17 Mar 2009 14:31:21 +0000

very nice script, thanks - I'm using it since yesterday...

Jakob at Mon, 16 Mar 2009 19:00:00 +0100

Jakob — Mon, 16 Mar 2009 18:00:00 +0000

Thanks Lukas and Robin. I have incorporated both of your sugestions and bug fixes into the current script. greetings Jakob

Robin Speekenbrink at Mon, 16 Mar 2009 18:44:20 +0100

Robin Speekenbrink — Mon, 16 Mar 2009 17:44:20 +0000

An update (and fix) for my previous comment on the breaking of colours in svndiff: The option -R fixes this... You might want to fix this in your original script: /usr/bin/svn diff $@|colordiff|less -R Hope it helps!

Lukas at Mon, 16 Mar 2009 11:02:10 +0100

Lukas — Mon, 16 Mar 2009 10:02:10 +0000

One of the things that annoys me with svn diff is that there is no way to ignore whitespace changes, which is why I have defined an alias: alias svndiff='svn diff --diff-cmd `which diff` -x "-u -w"'

Robin Speekenbrink at Mon, 16 Mar 2009 09:45:05 +0100

Robin Speekenbrink — Mon, 16 Mar 2009 08:45:05 +0000

Jakob, Nice addons! Although i seem to be running into a problem using colordiff... Your colorization works like a charm on the svnlog, svnst etc but when using svndiff the escape codes seem to show... I've installed the colordiff and standalone it works like a charm but when adding |less to it, it breaks the coloring... Anyway to fix this?

Jakob at Mon, 16 Mar 2009 01:20:17 +0100

Jakob — Mon, 16 Mar 2009 00:20:17 +0000

Evan if you want to show the externals using my solution just call "/usr/bin/svn st" instead of "svn st". Unfortunately a side effect would be, that the coloring than does not work also. Concerning the problem with the escape codes. Have you copy&pasted different sections of the blog article or did you copy&paste from one of the bashrc files I provided. In most cases there are problems with the escape sequences copied correctly. "^[" is actually one character not to. Because it only stands for the ESC character. If it is not the right escape char in your document try to replace it manually. In vim for example you can insert the needed escape character by pressing followed by in insert mode. greetings Jakob

Evan at Sun, 15 Mar 2009 22:53:36 +0100

Evan — Sun, 15 Mar 2009 21:53:36 +0000

You may also want to take a look at a post I did here (http://www.dotevan.com/2008/11/08/de-annoyifying-subversion-externals/). It allows you to default externals on the status to off, but also allows you to switch it back on. As a side note, I couldn't get the colorization to work in my terminal -- it just displays the escape codes, rather than the colors, even though my terminal is set to display ansi color.

Jakob at Sun, 15 Mar 2009 20:52:54 +0100

Jakob — Sun, 15 Mar 2009 19:52:54 +0000

Thanks. It's fixed now. I guess I should not write bash scripts at 4 o'clock in the morning ;) greetings Jakob

Matthew Turland at Sun, 15 Mar 2009 19:48:26 +0100

Matthew Turland — Sun, 15 Mar 2009 18:48:26 +0000

The alternative version has a syntax error. svnlog() is missing an opening {.

Jakob at Sun, 15 Mar 2009 03:42:15 +0100

Jakob — Sun, 15 Mar 2009 02:42:15 +0000

I see your point. Until now I actually used the same naming scheme you are presenting. For this blog post I decided to pimp the calling code a little because I remembered how hard it has been for me at the beginning to use svnup instead of svn up which I typed as some kind of reflex. In most of the cases you will want to use the enhanced version. If you really need to get the unmodified behaviour or output calling the svn binary using its full path "/usr/bin/svn" will do the trick. I think considering the number of times you will need the default output instead of the new one this is a useful solution. Nevertheless you are right the user should be able to choose between the two different calling behaviours. Therefore I put up a second version of the bashrc functions using the naming scheme you sugested. greetings Jakob

Kore at Sun, 15 Mar 2009 00:56:12 +0100

Kore — Sat, 14 Mar 2009 23:56:12 +0000

I actually don't really like modifying the behaviour of the original program. That's why the wrapper functions I use are named "svnup", "svndiff", etc. You overwrite the original behaviour, why might make it harder to use the original tool for some tasks. Like displaying changes in externals, even this is seldomly required... Another thing which will stop working are simple snippets like: `svn st | grep '^?' | xargs svn add` because of the appended color codes.