# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-28 11:00:36
# Node ID e1008af8f033b0c7e6a5400f9e54cdf8e9515842
# Parent  2fa39df61008df1a1179bc2972db35027d7481d7

subrepo: Turn off interactive mode when merging mercurial repo.

If there is a merge conflict in the sub repositories mercurial
will prompt the used to decide which version to use.

diff --git a/vcsserver/hg.py b/vcsserver/hg.py
--- a/vcsserver/hg.py
+++ b/vcsserver/hg.py
@@ -683,6 +683,13 @@ class HgRemote(object):
         repo = self._factory.repo(wire)
         baseui = self._factory._create_config(wire['config'])
         repo.ui.setconfig('ui', 'merge', 'internal:dump')
+
+        # In case of sub repositories are used mercurial prompts the user in
+        # case of merge conflicts or different sub repository sources. By
+        # setting the interactive flag to `False` mercurial doesn't prompt the
+        # used but instead uses a default value.
+        repo.ui.setconfig('ui', 'interactive', False)
+
         commands.merge(baseui, repo, rev=revision)
 
     @reraise_safe_exceptions