Mercurial > hg
diff contrib/check-code.py @ 16118:d554a3dcae5a stable
convert: tolerate spaces between splicemap parent ids (issue3203)
Splicemap lines are documented in hg help convert like:
key parent1, parent2
but parsed like:
key, parents = line.strip().rsplit(' ', 1)
parents = parents.replace(',', ' ').split()
The rsplit() call was introduced to handle spaces in keys for the generic
mapfile format. Spaces can appear in svn identifiers since they contain path
components. This logic makes less sense with splicemap since svn identifiers
can also appear on the right side, even if it is a bit less likely. Given the
parsing is theorically broken, I would rather follow what is documented already
and is correct in the main case where all identifiers are hg hashes. Also,
using svn identifiers in a splicemap sounds difficult as they are not easily
accessible.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Wed, 15 Feb 2012 11:21:24 +0100 |
parents | c6c9b83a1e8a |
children | a6941d7033fa f64b25f147d7 |