dannyroberts

/* copied from http://www.netlobo.com/url_query_string_javascript.html */         
function get_url_param( name )
{
  name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
  var regexS = "[\\?&]"+name+"=([^&#]*)";
  var regex = new RegExp( regexS );
  var results = regex.exec( window.location.href );
  if( results == null )
    return "";
  else

dannyroberts

function delete-pyc() {
    find . -name '*.pyc' -delete
}
function pull-latest-master() {
    git checkout master; git pull &
    git submodule foreach --recursive 'git checkout master; git pull &'
    until [ -z "$(ps aux | grep '[g]it pull')" ]; do sleep 1; done
}
function update-code() {
    pull-latest-master

dannyroberts

alias branch="git branch | grep '^\*' | sed 's/* //'"
alias push-current='git push origin $(branch)'

dannyroberts

Install

cd ~
git clone https://gist.github.com/5165174.git bash
ln -s bash/bash_profile .bash_profile

dannyroberts

function delete-pyc() {
    find . -name '*.pyc' -delete
}
function pull-latest-master() {
    git checkout master; git pull origin master
    git submodule update --init
    git submodule foreach --recursive 'git checkout master; git pull origin master &'
    until [ -z "$(ps aux | grep '[g]it pull')" ]; do sleep 1; done
}
function update-code() {

dannyroberts

source /usr/local/git/contrib/completion/git-completion.bash
alias g="git"; __git_complete g _git
alias l="git status"
alias d="git diff"; __git_complete d _git_diff
alias ds="git diff --cached"
alias m="git commit -m "
alias am="git commit -am "
alias a="git add "
alias o-="git checkout --"
alias o="git checkout"; __git_complete o _git_checkout

dannyroberts

"""
This file is meant to be used in the following manner:

$ python make_rebuild_staging.py < staging.yaml > rebuildstaging-tmp.sh; bash rebuildstaging-tmp.sh

Where staging.yaml looks as follows:

    trunk: master
    name: autostaging
    branches:

dannyroberts

Error handling antipattern

So I trace down a 500 to the line:

foo.get_bar(bar)

which is raising an IndexError. I figure out it means that there is no such bar, and that in that case we want to do nothing, so I change it to

dannyroberts

git remote add -f couchforms git://github.com/dimagi/couchforms.git
git merge -s ours --no-commit couchforms/master

# --prefix lets you specify where to put the submodule code
# the thing after the colon in couchforms/master:couchforms
# lets you specify what part of the submodule code to merge in
git read-tree --prefix=corehq/ex-submodules/couchforms -u couchforms/master:couchforms

git commit -m "subtree merge couchforms into corehq/ex-submodules"

dannyroberts

Did you know...

...that git lets you move and rename whole directories while preserving the git history of those files?

If you run

git read-tree --prefix=$NEW_PATH -u master:$OLD_PATH
rm -rf $OLD_PATH
# ...you probably want to change some imports...
git commit -m $MESSAGE