follow-up fixes for Mercurial renamed files handling
fixes #666