##// END OF EJS Templates
convert/svn: read trunk name once, use None for default
Patrick Mezard -
r13529:9b62cbe8 default
parent child Browse files
Show More
@@ -259,6 +259,7 b' class svn_source(converter_source):'
259 except ValueError:
259 except ValueError:
260 raise util.Abort(_('svn: revision %s is not an integer') % rev)
260 raise util.Abort(_('svn: revision %s is not an integer') % rev)
261
261
262 self.trunkname = self.ui.config('convert', 'svn.trunk', 'trunk').strip('/')
262 self.startrev = self.ui.config('convert', 'svn.startrev', default=0)
263 self.startrev = self.ui.config('convert', 'svn.startrev', default=0)
263 try:
264 try:
264 self.startrev = int(self.startrev)
265 self.startrev = int(self.startrev)
@@ -761,9 +762,8 b' class svn_source(converter_source):'
761 author = author and self.recode(author) or ''
762 author = author and self.recode(author) or ''
762 try:
763 try:
763 branch = self.module.split("/")[-1]
764 branch = self.module.split("/")[-1]
764 trunkname = self.ui.config('convert', 'svn.trunk', 'trunk')
765 if branch == self.trunkname:
765 if branch == trunkname.strip('/'):
766 branch = None
766 branch = ''
767 except IndexError:
767 except IndexError:
768 branch = None
768 branch = None
769
769
General Comments 0
You need to be logged in to leave comments. Login now