comparison mercurial/mergestate.py @ 48946:642e31cb55f0

py3: use class X: instead of class X(object):

The inheritance from object is implied in Python 3. So this should
be equivalent.

This change was generated via an automated search and replace. So there
may have been some accidental changes.

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

48945:55d132525155

CHANGE_ADDED = b'added'
CHANGE_REMOVED = b'removed'
CHANGE_MODIFIED = b'modified'


class MergeAction(object):
    """represent an "action" merge need to take for a given file

    Attributes:

    _short: internal representation used to identify each action

    ACTION_CHANGED_DELETED,
    ACTION_DELETED_CHANGED,
)


class _mergestate_base(object):
    """track 3-way merge state of individual files

    The merge state is stored on disk when needed. Two files are used: one with
    an old format (version 1), and one with a new format (version 2). Version 2
    stores a superset of the data in version 1, including new kinds of records

48946:642e31cb55f0

CHANGE_ADDED = b'added'
CHANGE_REMOVED = b'removed'
CHANGE_MODIFIED = b'modified'


class MergeAction:
    """represent an "action" merge need to take for a given file

    Attributes:

    _short: internal representation used to identify each action

    ACTION_CHANGED_DELETED,
    ACTION_DELETED_CHANGED,
)


class _mergestate_base:
    """track 3-way merge state of individual files

    The merge state is stored on disk when needed. Two files are used: one with
    an old format (version 1), and one with a new format (version 2). Version 2
    stores a superset of the data in version 1, including new kinds of records