[Updated] D12145: simplemerge: convert MergeInput to regular, non-attr.ib class

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGaed8ef33db8b: simplemerge: convert MergeInput to regular, non-attr.ib class (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12145?vs=32133&id=32187

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12145/new/

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,
@@ -474,14 +473,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 simplemerge(



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220215/ff0284db/attachment-0002.html>