comparison hglib/client.py @ 46:ebcc5d7dd528

client: introduce merge handlers

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

45:191855a9d813

import subprocess, os, struct, cStringIO, collections, re
import hglib, error, util, templates

from util import cmdbuilder

class hgclient(object):
    inputfmt = '>I'

        out = self.rawcommand(args)
        out = out.split('\0')[:-1]

        return self._parserevs(out)

    def merge(self, rev=None, force=False, tool=None, cb=None):
        # we can't really use --preview since merge doesn't support --template
        args = cmdbuilder('merge', r=rev, f=force, t=tool)

        self.rawcommand(args, prompt=cb)

    def move(self, source, dest, after=False, force=False, dryrun=False,
             include=None, exclude=None):
        if not isinstance(source, list):
            source = [source]

46:ebcc5d7dd528

import subprocess, os, struct, cStringIO, collections, re
import hglib, error, util, templates, merge

from util import cmdbuilder

class hgclient(object):
    inputfmt = '>I'

        out = self.rawcommand(args)
        out = out.split('\0')[:-1]

        return self._parserevs(out)

    def merge(self, rev=None, force=False, tool=None, cb=merge.handlers.abort):
        """
        merge working directory with another revision

        cb can one of merge.handlers, or a function that gets a single argument
        which are the contents of stdout. It should return one of the expected
        choices (a single character).
        """
        # we can't really use --preview since merge doesn't support --template
        args = cmdbuilder('merge', r=rev, f=force, t=tool)

        prompt = None
        if cb is merge.handlers.abort:
            prompt = cb
        elif cb is merge.handlers.noninteractive:
            args.append('-y')
        else:
            prompt = lambda size, output: cb(output) + '\n'

        self.rawcommand(args, prompt=prompt)

    def move(self, source, dest, after=False, force=False, dryrun=False,
             include=None, exclude=None):
        if not isinstance(source, list):
            source = [source]