( )⚙ D12145 simplemerge: convert MergeInput to regular, non-attr.ib class

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12145

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

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGaed8ef33db8b: simplemerge: convert MergeInput to regular, non-attr.ib class
Summary

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

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (15 lines)

Diff 32094

mercurial/simplemerge.py

# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, see <http://www.gnu.org/licenses/>.
# mbp: "you know that thing where cvs gives you conflict markers?" # mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that." # s: "i hate that."
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from .thirdparty import attr
from . import ( from . import (
error, error,
mdiff, mdiff,
pycompat, pycompat,
) )
from .utils import stringutil from .utils import stringutil
if what == b'conflict': if what == b'conflict':
for side in sides: for side in sides:
lines.extend(group_lines[side]) lines.extend(group_lines[side])
else: else:
lines.extend(group_lines) lines.extend(group_lines)
return lines return lines
@attr.s
class MergeInput(object): class MergeInput(object):
fctx = attr.ib() def __init__(self, fctx, label=None, label_detail=None):
label = attr.ib(default=None) self.fctx = fctx
self.label = label
# If the "detail" part is set, then that is rendered after the label and # 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 # separated by a ':'. The label is padded to make the ':' aligned among
# merge inputs. # all merge inputs.
label_detail = attr.ib(default=None) self.label_detail = label_detail
def _verifytext(self, ui, opts): def _verifytext(self, ui, opts):
"""verifies that text is non-binary (unless opts[text] is passed, """verifies that text is non-binary (unless opts[text] is passed,
then we just warn)""" then we just warn)"""
# Merges were always run in the working copy before, which means # Merges were always run in the working copy before, which means
# they used decoded data, if the user defined any repository # they used decoded data, if the user defined any repository
# filters. # filters.
# #