Gilles Ruppert » Tools

Creating patch files with git

elduderino78 — Mon, 28 Jun 2010 21:42:43 +0000

Git has a built in way to create patches and Github has a great write up on this.
The git format-patch command is useful if all your changes are committed and you want to create a patch of certain commits.

Sometimes however you have changes that you can’t or don’t want to commit for whatever reason. Git lets you easily create a standard patch file that you can apply on another clone or branch.

To create the patch:

git diff --no-prefix > path-to-patch/name-of-the-patch-file

To apply the patch:

patch -p0 < path-to-patch/name-of-the-patch-file

Voila.

Updating the locate database on OSX

elduderino78 — Sat, 27 Mar 2010 22:14:09 +0000

locate is a very handy command to find files on the system. It is much faster than find since it keeps a database of all the system files. This database is periodically updated, but if you want to update it yourself, just use the following command:

sudo /usr/libexec/locate.updated

Here you can get a bit more information on this handy little command

Integrating JSLint for vim

elduderino78 — Sat, 03 Oct 2009 22:25:08 +0000

A couple of months ago I moved away from TextMate and started using vim for most of my text editing needs. I love TextMate, but I needed a powerful text editor that is also available on other operating systems.

Overall I love vim: it has a steep learning curve, but it’s very powerful.If you are touch-typing and loath the mouse as much as I do, it’s fantastic. But I found myself missing out on some of TextMate’s great bundles, and JSLint integration is one of them. After some googling around and looking at different solutions, this is the one that was easiest to install and I like the functionality.

First download & install JavaScript Lint. On OSX & Linux, you can do so by copying the resulting folder into your PATH. I put it in /usr/local/bin/.

Then get the JavaScriptLint vim plugin by Joe Stelmach and restart vim.

Off you go. When you save a JavaScript file in vim, you will get a window with JSLint warnings. If you want to configure JSLint to show/hide certain errors, you can edit the config (jsl.default.conf) in the folder. You might want to backup the file before editing it.

Happy linting!

Upgrading the Subversion command line client on Mac OSX Leopard

elduderino78 — Wed, 20 May 2009 23:04:13 +0000

UPDATE: Since I wrote this post, I found a couple of other ways of upgrading the Subversion command line client.

One option is to install the package via MacPorts or Homebrew. If you use Homebrew, you probably don’t have to do anything else, as Homebrew sets up the symlinks automatically. If you install via MacPorts, you have the same issue as you do with the Collabnet installer.

Instead of creating symlinks though, you can also change the PATH environment variable. To do this, open ~/.bash_profile or ~/.bashrc in your favourite editor (vim) and make sure that you have a line similar to this:

export PATH=/opt/local/bin:/opt/local/sbin:$PATH

This will make sure that /opt/local/bin/, which contains the MacPorts installs, will be checked before any other locations. MacPorts should add this by itself. This makes sure that svn as installed by MacPorts will be used.

As before: you can check which svn binary you are using by typing which svn and svn --version in the terminal.

Hope this helps!

Original post

OSX Leopard ships with Subversion 1.4.x by default. Since then, SVN has had 2 major upgrades (merge tracking anyone?). To make things easy, there is a binary available at Collab.net. But unfortunately you need to do some work yourself.

The path of the built in Subversion command line client is different to the one that the Collab.net Community binary is installed to. The following steps will fix this.

Disclaimer – Be careful: when you use the Terminal you are flying without a safety net! No undo & no restore from trash. Do this at your own risk and don’t forget to have an up-to-date backup!!!

install the binary downloaded to Collab.net
open your Terminal and check which version of SVN you are using by typing svn --version. This should say 1.4.x
check which installed instance of SVN the OS is using by typing which svn. This will return the path to the SVN version you are using, which probably is /usr/local/bin/svn
check whether the Collab.net version is installed by going to it: cd /opt/subversion/bin. Doing an ls should show you the subversion files
Backup the current svn location: by going to it (cd /usr/local/bin) and copying it to your desktop or wherever you fancy (mv svn* ~/Desktop/)
now you need to create symlinks to the Collab.net binaries:
- ln -s /opt/subversion/bin/svn svn
- ln -s /opt/subversion/bin/svnadmin svnadmin
- ln -s /opt/subversion/bin/svndumpfilter svndumpfilter
- ln -s /opt/subversion/bin/svnlook svnlook
- ln -s /opt/subversion/bin/svnserve svnserve
- ln -s /opt/subversion/bin/svnsync svnsync
- ln -s /opt/subversion/bin/svnversion svnversion
That should be it

The beauty is that you only need to do this once. The next time you upgrade your Subversion client, the symlinks will just point to the updated files and everything should be fine. As I said earlier though: only do this if you feel comfortable on the command line.

UPDATE: I have been told that some people seem to have SVN installed in /usr/bin/. Just use the path that is returned by the which svn command. You might also need to use sudo to run some of the command (i.e. move).