diff -r 45562379ce4e -r e8203629371b hgext/convert/subversion.py --- a/hgext/convert/subversion.py Thu Apr 18 10:05:50 2013 -0500 +++ b/hgext/convert/subversion.py Tue Jan 21 11:34:55 2014 -0600 @@ -454,13 +454,13 @@ del self.commits[rev] return commit - def checkrevformat(self, revstr): + def checkrevformat(self, revstr, mapname='splicemap'): """ fails if revision format does not match the correct format""" if not re.match(r'svn:[0-9a-f]{8,8}-[0-9a-f]{4,4}-' '[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]' '{12,12}(.*)\@[0-9]+$',revstr): - raise util.Abort(_('splicemap entry %s is not a valid revision' - ' identifier') % revstr) + raise util.Abort(_('%s entry %s is not a valid revision' + ' identifier') % (mapname, revstr)) def gettags(self): tags = {}