diff --git a/hgext3rd/copytrace.py b/hgext3rd/copytrace.py --- a/hgext3rd/copytrace.py +++ b/hgext3rd/copytrace.py @@ -439,7 +439,7 @@ def _getreponame(repo, ui): reporoot = repo.origroot if util.safehasattr(repo, 'origroot') else '' - reponame = ui.config('paths', 'default', reporoot) + reponame = ui.config('paths', 'default') or reporoot if reponame: reponame = os.path.basename(reponame) return reponame diff --git a/hgext3rd/edrecord.py b/hgext3rd/edrecord.py --- a/hgext3rd/edrecord.py +++ b/hgext3rd/edrecord.py @@ -28,7 +28,7 @@ "editor"): return "editor" elif self.config("ui", "interface.%s" % feature, None) is None: - if self.config("ui", "interface", None) == "editor": + if self.config("ui", "interface") == "editor": return "editor" return super(edrecordui, self).interface(feature) diff --git a/hgext3rd/logginghelper.py b/hgext3rd/logginghelper.py --- a/hgext3rd/logginghelper.py +++ b/hgext3rd/logginghelper.py @@ -24,7 +24,7 @@ def _localrepoinit(orig, self, baseui, path=None, create=False): orig(self, baseui, path, create) - reponame = self.ui.config('paths', 'default', path) + reponame = self.ui.config('paths', 'default') if reponame: reponame = os.path.basename(reponame) configoptstolog = self.ui.configlist('logging', 'configoptions') diff --git a/hgext3rd/pushrebase.py b/hgext3rd/pushrebase.py --- a/hgext3rd/pushrebase.py +++ b/hgext3rd/pushrebase.py @@ -804,7 +804,7 @@ bundle.close() # Move public phase forward - publishing = op.repo.ui.configbool('phases', 'publish', True) + publishing = op.repo.ui.configbool('phases', 'publish', untrusted=True) if publishing: phases.advanceboundary(op.repo, tr, phases.public, [added[-1]]) diff --git a/hgext3rd/sparse.py b/hgext3rd/sparse.py --- a/hgext3rd/sparse.py +++ b/hgext3rd/sparse.py @@ -393,8 +393,7 @@ msg = ( "warning: sparse profile '%s' not found " "in rev %s - ignoring it\n" % (profile, ctx)) - if self.ui.configbool( - 'sparse', 'missingwarning', True): + if self.ui.configbool('sparse', 'missingwarning'): self.ui.warn(msg) else: self.ui.debug(msg) diff --git a/tests/test-check-config-hg.t b/tests/test-check-config-hg.t --- a/tests/test-check-config-hg.t +++ b/tests/test-check-config-hg.t @@ -18,9 +18,6 @@ elif ui.configbool('p4fastimport', 'useworker', False): conflict on p4fastimport.useworker: ('bool', '') != ('str', '') - repo.ui.config("paths", "default"))) - - conflict on paths.default: ('str', '') != ('str', '') if ui.configbool("experimental", "histeditng"): conflict on experimental.histeditng: ('bool', '') != ('str', '')