Patchwork [5,of,8] chgserver: add merge-tools to sensitive config items

login
register
mail settings
Submitter Pulkit Goyal
Date March 26, 2020, 7:36 a.m.
Message ID <b0054c8ead9cffcac97e.1585208212@workspace>
Download mbox | patch
Permalink /patch/45900/
State Accepted
Headers show

Comments

Pulkit Goyal - March 26, 2020, 7:36 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1584987209 -19800
#      Mon Mar 23 23:43:29 2020 +0530
# Node ID b0054c8ead9cffcac97eaac6742b2c9edecf556a
# Parent  e31595eeab43977cd927a5a9ab43c371c202bb24
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.

Patch

diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py
--- a/mercurial/chgserver.py
+++ b/mercurial/chgserver.py
@@ -80,10 +80,12 @@  def _hashlist(items):
 # 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
 ]