diff hglib/merge.py @ 46:ebcc5d7dd528

client: introduce merge handlers

These can control the behaviour when Mercurial prompts what to do with regard
to a specific file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hglib/merge.py	Tue Aug 16 23:58:24 2011 +0300
@@ -0,0 +1,19 @@
+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 ''
+
+    """
+    This corresponds to Mercurial's -y/--noninteractive global option, which
+    picks the first choice on all prompts.
+    """
+    noninteractive = 'yes'