Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chgserver: add merge-tools to sensitive config items
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 23 Mar 2020 23:43:29 +0530
changeset 44616 bdc8a5944d44
parent 44615 78a8f65eacc8
child 44617 1e459ac4cb48
chgserver: add merge-tools to sensitive config items Because this can change whether the ui is gui or not. This fixes test-extdiff.t with chg.
mercurial/chgserver.py file | annotate | diff | comparison | revisions 
--- a/mercurial/chgserver.py	Wed Mar 25 13:20:08 2020 +0530
+++ b/mercurial/chgserver.py	Mon Mar 23 23:43:29 2020 +0530
@@ -80,10 +80,12 @@
 # sensitive config sections affecting confighash
 _configsections = [
     b'alias',  # affects global state commands.table
+    b'diff-tools',  # affects whether gui or not in extdiff's uisetup
     b'eol',  # uses setconfig('eol', ...)
     b'extdiff',  # uisetup will register new commands
     b'extensions',
     b'fastannotate',  # affects annotate command and adds fastannonate cmd
+    b'merge-tools',  # affects whether gui or not in extdiff's uisetup
     b'schemes',  # extsetup will update global hg.schemes
 ]
Mercurial