comparison contrib/simplemerge @ 4408:1ef4445c6506

simplemerge: flush stdout before writing to stderr.

Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

4407:f97b89314fb3

from mercurial.i18n import _


class CantReprocessAndShowBase(Exception):
    pass


def intersect(ra, rb):
    """Given two ranges return the range where they intersect or None.

        if util.binary(text):
            msg = _("%s looks like a binary file.") % filename
            if not opts.get('text'):
                raise util.Abort(msg)
            elif not opts.get('quiet'):
                sys.stderr.write(_('warning: %s\n') % msg)
        return text

    name_a = local
    name_b = other
    labels = opts.get('label', [])

    if not opts.get('print'):
        out.rename()

    if m3.conflicts:
        if not opts.get('quiet'):
            sys.stdout.flush()
            sys.stderr.write(_("warning: conflicts during merge.\n"))
        return 1

options = [('L', 'label', [], _('labels to use on conflict markers')),
           ('a', 'text', None, _('treat all files as text')),
           ('p', 'print', None,

4408:1ef4445c6506

from mercurial.i18n import _


class CantReprocessAndShowBase(Exception):
    pass
    

def warn(message):
    sys.stdout.flush()
    sys.stderr.write(message)
    sys.stderr.flush()


def intersect(ra, rb):
    """Given two ranges return the range where they intersect or None.

        if util.binary(text):
            msg = _("%s looks like a binary file.") % filename
            if not opts.get('text'):
                raise util.Abort(msg)
            elif not opts.get('quiet'):
                warn(_('warning: %s\n') % msg)
        return text

    name_a = local
    name_b = other
    labels = opts.get('label', [])

    if not opts.get('print'):
        out.rename()

    if m3.conflicts:
        if not opts.get('quiet'):
            warn(_("warning: conflicts during merge.\n"))
        return 1

options = [('L', 'label', [], _('labels to use on conflict markers')),
           ('a', 'text', None, _('treat all files as text')),
           ('p', 'print', None,