Adding upstream version 110.0.1.upstream/110.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 0 deletions

diff --git a/third_party/python/python-hglib/hglib/merge.py b/third_party/python/python-hglib/hglib/merge.py
new file mode 100644
index 0000000000..88bc99d993
--- /dev/null
+++ b/third_party/python/python-hglib/hglib/merge.py
@@ -0,0 +1,21 @@
+from hglib.util import b
+
+class handlers(object):
+    """
+    These can be used as the cb argument to hgclient.merge() to control the
+    behaviour when Mercurial prompts what to do with regard to a specific file,
+    e.g. when one parent modified a file and the other removed it.
+    """
+
+    @staticmethod
+    def abort(size, output):
+        """
+        Abort the merge if a prompt appears.
+        """
+        return b('')
+
+    """
+    This corresponds to Mercurial's -y/--noninteractive global option, which
+    picks the first choice on all prompts.
+    """
+    noninteractive = 'yes'