Add source-span to hg output, comments