A better SVN on a Mac

For a couple of projects, I’ve started using Subversion instead of CVS. I was never a big connoisseur of CVS, and there are plenty of people out there already extolling the virtues of SVN over CVS, so that’s not what this is about. Instead, I want to post a couple of things that help make SVN more “Mac-like” for me.

I should point out that both of these have been done before, and really I’m only collecting together some details I’ve found. While I do tend to write my code in Xcode, due to the multi-platform nature of the projects I don’t actually use Xcode’s project format. Instead, I compile through Terminal.app and likewise manage SVN through it. As nice as the terminal is, it’s nice to have some more “graphical” interface when possible.

Setting your $EDITOR

The first change is to set the the $EDITOR environmental variable to an application of your choice:

export EDITOR="/usr/bin/open -n -W -a /Applications/TextEdit.app"

Put this line in your Bash profile, the file conveniently called ~/.profile . Here I’ve set it to be TextEdit, but any text-editing application might work (I had also considered Smultron). You can also set it to any X-Windows application, such as XEmacs:

export EDITOR=/sw/bin/xemacs

(I have XEmacs installed with Fink). In Leopard, X11 will open up automatically as necessary.

But let’s get back to that open command and go through the flags in use.

  • -a lets you specify which application to use to open the file that will be passed (and should be followed by the absolute path to the app you want). Potentially, you could also use -b to give it the bundle identifier for the application in question, but I am less familiar with how to figure out what bundles to specify with this.

  • -n opens up a new instance of the application in question. So if I already have a copy of TextEdit open (not really likely), it opens up a second copy. This goes together with the next flag to get this to actually work.

  • -W tells the open command to stay open until the application in question quits (otherwise, it would exit after TextEdit opened).

The -n and -W are the real magic here. If you try to do a committal in svn, a la

svn commit

a temporary file is made and the $EDITOR variable is used to open it. Once the $EDITOR program quits, it uses the contents of the temporary file for the log. So now you just need to remember to quit TextEdit when you’re done writing the log message.

Using Filemerge.app instead off diff

I happen to like FileMerge. It doesn’t do as smart a comparison of files as I’d like sometimes, but I don’t think it’s any worse than regular diff. Instead of reprinting what someone else has already done for me, I’ll send you to a link to bbum’s site (who I believe is involved in the wonderful Fink project). I should point out this is an update to an original idea by Michael Ash, I just find this modification more refined. Now, when you type

svn diff somefile

instead of outputting to the terminal, FileMerge opens! It is supposed to also work in the case of conflicts, but I haven’t been unfortunate enough to have to use it for that, yet.

Technorati Tags: , , , ,

Comments

Post a Comment

Popular posts from this blog

Comics without the newspaper

I happen to love newspaper comics, but over the years I’ve either not gotten a newspaper, or not gotten a newspaper carrying all the comics I’d like to read. I know I’m not alone in loving comics; just take a look at Comics Curmudgeon . The people who both read and post comments there clearly love comics, which is half of what makes it fun. Add in to it with some of the cartoonists clearly joining in with the joke, and really its a lot of fun. The lack of print has made things difficult in the past, but I have tended to get by. The general solution most people use is to go to the online sites of newspapers carrying the comic of their choice, in particular, one that also puts it up online. The more industrious of us use things like the Perl tool dailystrips . Basically, you tell it the pattern for finding a comic of a particular date, and it scrapes the website for that comic. This works, but has some hangups. Most importantly, it means the newspaper is not getting a...
Read more

Xcode 3 language specification changes

So much has changed in Leopard that I am not surprised I cannot find anything about this yet. Basically, the plugin interface for Xcode 3 has severely changed. In particular, over the past few days I have been trying to make a *.pblangspec file for the programming language used by my group for software verification purposes (who, it ought to be noted, I do not speak for on this website). It turns out, that’s not what I really wanted to do. I am still trying to figure out what all has changed, but here are a few key differences: The file format is totally different. This is somewhat superficially noted by the fact that the file’s extension should now be xclangspec as opposed to pblangspec . For instance, I am using Resolve.xclangspec . The file format is totally different. I’m mentioning it twice, mainly to point out that there are no guides out there for it yet. It seems to make sense, if you realize that Xcode is now doing a lot more than just keyword matching a...
Read more

iPhone and iPod Touch, 802.1X and LEAP

This is more a note for people who were wondering like myself: the current OS X that comes with the iPod Touch and iPhone cannot handle either 802.1X or LEAP (before anyone tells me it handles 802.11x just fine, please remember that 802.1X and LEAP are specific forms of encrypting a wireless connection, not types of wireless connections. 802.1 1 x is instead a generic term used for the varying speeds of wireless, i.e. 802.11a, 802.11b, 802.11g, 802.11n, ….) This is really too bad, as both are have been built in to Mac OS X since at least version 10.3, and also both are the main ways I can get wireless at OSU . I have every intent on finding out if this gets fixed with subsequent OS updates. Incidentally, a big reason I am posting this is due to some Apple Store employees erroneously telling me it should work on the iPhone and iPod Touch, since it is built in to Mac OS X, which shares a lot of common code with the OS X on both devices (as far as anyone seems to know). I don...
Read more