This revision was automatically updated to reflect the committed changes. Closed by commit rHG09db9613df09: convert: register missed subversion config items (authored by durin42, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1180?vs=3005&id=3017 REVISION DETAIL https://phab.mercurial-scm.org/D1180 AFFECTED FILES hgext/convert/__init__.py hgext/convert/subversion.py CHANGE DETAILS diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -352,8 +352,10 @@ raise error.Abort(_('svn: revision %s is not an integer') % revs[0]) - self.trunkname = self.ui.config('convert', 'svn.trunk', - 'trunk').strip('/') + trunkcfg = self.ui.config('convert', 'svn.trunk') + if trunkcfg is None: + trunkcfg = 'trunk' + self.trunkname = trunkcfg.strip('/') self.startrev = self.ui.config('convert', 'svn.startrev') try: self.startrev = int(self.startrev) diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -112,6 +112,15 @@ configitem('convert', 'svn.debugsvnlog', default=True, ) +configitem('convert', 'svn.trunk', + default=None, +) +configitem('convert', 'svn.tags', + default=None, +) +configitem('convert', 'svn.branches', + default=None, +) configitem('convert', 'svn.startrev', default=0, ) To: durin42, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
