( )⚙ D1180 convert: register missed subversion config items

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1180

convert: register missed subversion config items
ClosedPublic

Authored by durin42 on Oct 18 2017, 6:13 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGeffae88bccdb: convert: register missed subversion config items
rHG09db9613df09: convert: register missed subversion config items
Summary

Should fix the build failures on the Solaris builders.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 18 2017, 6:13 PM
martinvonz accepted this revision.Oct 18 2017, 6:20 PM
martinvonz added a subscriber: martinvonz.

Thanks for fixing!

This revision is now accepted and ready to land.Oct 18 2017, 6:20 PM
Closed by commit rHG09db9613df09: convert: register missed subversion config items (authored by durin42). · Explain WhyOct 18 2017, 7:43 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3017

hgext/convert/__init__.py

default=0, default=0,
) )
configitem('convert', 'skiptags', configitem('convert', 'skiptags',
default=False, default=False,
) )
configitem('convert', 'svn.debugsvnlog', configitem('convert', 'svn.debugsvnlog',
default=True, default=True,
) )
configitem('convert', 'svn.trunk',
default=None,
)
configitem('convert', 'svn.tags',
default=None,
)
configitem('convert', 'svn.branches',
default=None,
)
configitem('convert', 'svn.startrev', configitem('convert', 'svn.startrev',
default=0, default=0,
) )
# Commands definition was moved elsewhere to ease demandload job. # Commands definition was moved elsewhere to ease demandload job.
@command('convert', @command('convert',
[('', 'authors', '', [('', 'authors', '',

hgext/convert/subversion.py

raise error.Abort(_('subversion source does not support ' raise error.Abort(_('subversion source does not support '
'specifying multiple revisions')) 'specifying multiple revisions'))
try: try:
latest = int(revs[0]) latest = int(revs[0])
except ValueError: except ValueError:
raise error.Abort(_('svn: revision %s is not an integer') % raise error.Abort(_('svn: revision %s is not an integer') %
revs[0]) revs[0])
self.trunkname = self.ui.config('convert', 'svn.trunk', trunkcfg = self.ui.config('convert', 'svn.trunk')
'trunk').strip('/') if trunkcfg is None:
trunkcfg = 'trunk'
self.trunkname = trunkcfg.strip('/')
self.startrev = self.ui.config('convert', 'svn.startrev') self.startrev = self.ui.config('convert', 'svn.startrev')
try: try:
self.startrev = int(self.startrev) self.startrev = int(self.startrev)
if self.startrev < 0: if self.startrev < 0:
self.startrev = 0 self.startrev = 0
except ValueError: except ValueError:
raise error.Abort(_('svn: start revision %s is not an integer') raise error.Abort(_('svn: start revision %s is not an integer')
% self.startrev) % self.startrev)