Google

Multi-repository helper scripts

I use a set of two-letter commands to make it easier to function in a wide range of source-code repositories without having to always remember what scm prefix to type. It also makes some things about the different scms more homogenous.

I started out by writing a perl script that can be symlinked to a bunch of two-letter commands, which works well, but you lose any scm-specific command-line completion for your shell, so I switched to a new method: redefining aliases on every chdir. However, the old script may still be useful and you can find it here:

As for the aliases, zsh makes it easy to run a script every time the shell changes into a new directory. As such, the following script is specific to zsh (bash users can use the repos script above). You may also need a couple helper scripts on your path, depending on which scm features you make use of.

A description of the 2-letter commands (aliases) follows:

ad
Does an "add" operation on the specified args.
ci
Does a checkin, defaulting to the committing of all changed files unless an arg beyond "-m msg" is specified (e.g. one or more filenames). For git, you can also specify a trailing -i if you want to turn off the -a option without specifying any files (and thus just commit things that have been explicitly added).
di
Repo's "diff" command. Auto-pages.
lo
Repo's "log" command. Auto-pages. The -v option can be used to request that names be included in the commit output, even in git. The -s option can be used in a git-svn repo to ask for the "git svn log" output.
st
Repo's "status" command. For cvs, this uses a helper script (cvs-status) to output status ala svn, with a default being local-only output, and remote-status added in via -u (though local cvs status does not include info on unknown files).
pu
Push the currently-checked-in changes. This has no effect in svn or cvs. For git, it will do the right thing in a git-svn checkout, as well as a custom cvs-modifying git checkout (see helper-script git-cvs-push and also the zsh talk below).
up
Update from the saved remote repo location. For git, this defaults to doing a "git pull --rebase" for a normal repo, or an "git svn rebase" for a git-svn repo.

The commands that "auto-page" pipe their output through "less -F" so that you get a pager if the output is long, and normal output if it is not. It helps to have a modern version of less to avoid jumping down to the bottom of the screen when that is not needed. Note that git auto-pages by default, so the aliases leave it alone (which ensures auto-color is unaffected).

Examples:

ci -m 'The commit message'
di foobar.c
lo -p        (-p doesn't work for cvs or svn)

The git-cvs-push and how it's used with the zsh project

The git-cvs-push script allows you to push commits out of a local git repository into an associated cvs repository. Commits are not pulled from cvs in any way, so it is assumed that someone is taking the cvs commits and turning them into git updates somewhere else, and that this mirrored git repository is what you've cloned for your local git copy. In order for the git-cvs-push script to work, there must be a directory named .git/cvs in your repo, and it must have a writable cvs checkout in it. (Aside: anyone doing cvs-to-git mirroring, you should check out my patches for cvsps 2.1 or cvsps 2.2b1 that fixes a problem with potentially misordered commits.)

A pratical example for the zsh project:

I maintain a git mirror of the official zsh cvs repository in the official git repo (both on SourceForge). This allows someone to pull zsh as a git repo, and keep up-to-date without ever having to fiddle with cvs. For those that want to be able to commit changes to their local git and then push them into the official cvs repo, the git-cvs-push script will figure out what changes to push and commit them into cvs via an appropriate "git cvsexportcommit" command.

Here's how to set this up:

git clone git://zsh.git.sf.net/gitroot/zsh/zsh
cd zsh/.git
cvs -z3 -d:ext:USERNAME@zsh.cvs.sf.net:/cvsroot/zsh co -P zsh  
mv zsh cvs
cd ..

After doing that, using the "pu" alias to push your git commits will run the git-cvs-push script (which makes sure that the affected files are up-to-date in the cvs checkout, modifies them, and checks them into cvs). After a few minutes, the git mirror should have updated, and your changes will be pullable by others via git. At that point you should use the "up" alias to let "git pull --rebase" reconcile the official commits with your local commits.


Home > repos
Feel free to with any questions or comments you may have.