More working on mercurial support