D12145: simplemerge: convert MergeInput to regular, non-attr.ib class
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Feb 8 21:27:31 UTC 2022
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12145
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -19,7 +19,6 @@
from __future__ import absolute_import
from .i18n import _
-from .thirdparty import attr
from . import (
error,
mdiff,
@@ -462,14 +461,14 @@
return lines
- at 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 __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 _verifytext(self, ui, opts):
"""verifies that text is non-binary (unless opts[text] is passed,
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list