From 2aa4a82499d4becd2284cdb482213d541b8804dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 16:29:10 +0200 Subject: Adding upstream version 86.0.1. Signed-off-by: Daniel Baumann --- third_party/python/python-hglib/hglib/merge.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 third_party/python/python-hglib/hglib/merge.py (limited to 'third_party/python/python-hglib/hglib/merge.py') 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' -- cgit v1.2.3