This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1195

config: fix default config value for svn.trunk
AbandonedPublic

Authored by lothiraldan on Oct 19 2017, 9:35 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Summary

Instead of fallbacking on a default in code, declare the right default during
configuration registration so the code is slightly cleaner.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Oct 19 2017, 9:35 AM
durin42 requested changes to this revision.Oct 19 2017, 10:54 AM
durin42 added a subscriber: durin42.

That's not the only place it's used. I don't have it in front of me, but look for trunk in other places (it's where svn.tags and svn.branches get used as well). The other callsite *needs* the default to be None.

This revision now requires changes to proceed.Oct 19 2017, 10:54 AM
lothiraldan abandoned this revision.Oct 19 2017, 10:58 AM

Indeed, the getcfgpath function also calls it, my bad.

Revision Contents
Changeset List

Diff 3031

hgext/convert/__init__.py

) )
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', configitem('convert', 'svn.trunk',
default=None, default='trunk',
) )
configitem('convert', 'svn.tags', configitem('convert', 'svn.tags',
default=None, default=None,
) )
configitem('convert', 'svn.branches', configitem('convert', 'svn.branches',
default=None, default=None,
) )
configitem('convert', 'svn.startrev', configitem('convert', 'svn.startrev',

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])
trunkcfg = self.ui.config('convert', 'svn.trunk') self.trunkname = self.ui.config('convert', 'svn.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)