Wait for merging my pull request.
Enable compdef for git and mercurial again.