File: merge.py

package info (click to toggle)
thunderbird 1%3A140.6.0esr-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 4,617,324 kB
  • sloc: cpp: 7,722,016; javascript: 5,902,751; ansic: 3,901,079; python: 1,413,347; xml: 653,997; asm: 462,284; java: 180,927; sh: 113,491; makefile: 20,460; perl: 14,288; objc: 13,059; yacc: 4,583; pascal: 3,352; lex: 1,720; ruby: 1,222; exp: 762; sql: 715; awk: 580; php: 436; lisp: 430; sed: 70; csh: 10
file content (21 lines) | stat: -rw-r--r-- 591 bytes parent folder | download | duplicates (43)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
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'