D1195: config: fix default config value for svn.trunk

[lothiraldan (Boris Feld)]

lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1195

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,10 +352,7 @@
                 raise error.Abort(_('svn: revision %s is not an integer') %
                                  revs[0])
 
-        trunkcfg = self.ui.config('convert', 'svn.trunk')
-        if trunkcfg is None:
-            trunkcfg = 'trunk'
-        self.trunkname = trunkcfg.strip('/')
+        self.trunkname = self.ui.config('convert', 'svn.trunk').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
@@ -113,7 +113,7 @@
     default=True,
 )
 configitem('convert', 'svn.trunk',
-    default=None,
+    default='trunk',
 )
 configitem('convert', 'svn.tags',
     default=None,



To: lothiraldan, #hg-reviewers
Cc: mercurial-devel