Don't try to rebase automatically; there's not enough benefit and it slows things down considerably
Correct the parameter passing for hg
Remove handling for hybrid svn/hg repos