Mercurial > hg
comparison hgext/convert/subversion.py @ 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 | 75979c8d4572 |
| children | 671aba341d90 |
comparison
equal
deleted
inserted
replaced
| 34889:554885e10868 | 34890:effae88bccdb |
|---|---|
| 350 latest = int(revs[0]) | 350 latest = int(revs[0]) |
| 351 except ValueError: | 351 except ValueError: |
| 352 raise error.Abort(_('svn: revision %s is not an integer') % | 352 raise error.Abort(_('svn: revision %s is not an integer') % |
| 353 revs[0]) | 353 revs[0]) |
| 354 | 354 |
| 355 self.trunkname = self.ui.config('convert', 'svn.trunk', | 355 trunkcfg = self.ui.config('convert', 'svn.trunk') |
| 356 'trunk').strip('/') | 356 if trunkcfg is None: |
| 357 trunkcfg = 'trunk' | |
| 358 self.trunkname = trunkcfg.strip('/') | |
| 357 self.startrev = self.ui.config('convert', 'svn.startrev') | 359 self.startrev = self.ui.config('convert', 'svn.startrev') |
| 358 try: | 360 try: |
| 359 self.startrev = int(self.startrev) | 361 self.startrev = int(self.startrev) |
| 360 if self.startrev < 0: | 362 if self.startrev < 0: |
| 361 self.startrev = 0 | 363 self.startrev = 0 |