Mercurial > hg-stable
changeset 34890:effae88bccdb
convert: register missed subversion config items
Should fix the build failures on the Solaris builders.
Differential Revision: https://phab.mercurial-scm.org/D1180
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 18 Oct 2017 18:11:50 -0400 |
| parents | 554885e10868 |
| children | 6b77c13a1aab |
| files | hgext/convert/__init__.py hgext/convert/subversion.py |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Thu Oct 19 03:20:47 2017 +0530 +++ b/hgext/convert/__init__.py Wed Oct 18 18:11:50 2017 -0400 @@ -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, )
--- a/hgext/convert/subversion.py Thu Oct 19 03:20:47 2017 +0530 +++ b/hgext/convert/subversion.py Wed Oct 18 18:11:50 2017 -0400 @@ -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)