comparison mercurial/simplemerge.py @ 48750:aed8ef33db8b

simplemerge: convert MergeInput to regular, non-attr.ib class

I'm about to add more logic and state to it.

Differential Revision: https://phab.mercurial-scm.org/D12145

48749:9ee70e175fed

# s: "i hate that."

from __future__ import absolute_import

from .i18n import _
from .thirdparty import attr
from . import (
    error,
    mdiff,
    pycompat,
)

        else:
            lines.extend(group_lines)
    return lines


@attr.s
class MergeInput(object):
    fctx = attr.ib()
    label = attr.ib(default=None)
    # If the "detail" part is set, then that is rendered after the label and
    # separated by a ':'. The label is padded to make the ':' aligned among all
    # merge inputs.
    label_detail = attr.ib(default=None)


def simplemerge(
    ui,
    local,

48750:aed8ef33db8b

# s: "i hate that."

from __future__ import absolute_import

from .i18n import _
from . import (
    error,
    mdiff,
    pycompat,
)

        else:
            lines.extend(group_lines)
    return lines


class MergeInput(object):
    def __init__(self, fctx, label=None, label_detail=None):
        self.fctx = fctx
        self.label = label
        # If the "detail" part is set, then that is rendered after the label and
        # separated by a ':'. The label is padded to make the ':' aligned among
        # all merge inputs.
        self.label_detail = label_detail


def simplemerge(
    ui,
    local,