Mercurial > public > mercurial-scm > hg
diff hgext/convert/subversion.py @ 20373:e8203629371b
convert: add mapname parameter to checkrevformat
Upcoming patches will add new map files so we change the calling sequence of
checkrevformat so that error messages will let the user know which file has the
wrong rev format.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 11:34:55 -0600 |
| parents | d54467c1a198 |
| children | 9616b03113ce |
line wrap: on
line diff
--- 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 = {}