# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1526014477 14400
# Node ID 000039f6ca2d5cba8c72044dca7e58b8aa2d057f
# Parent  14f4449711b8ee5c0dd90691e369e0891c59d68e
merge: drop support for using updateresults as tuples (API)

diff -r 14f4449711b8 -r 000039f6ca2d mercurial/merge.py
--- a/mercurial/merge.py	Fri May 11 00:54:12 2018 -0400
+++ b/mercurial/merge.py	Fri May 11 00:54:37 2018 -0400
@@ -1490,27 +1490,6 @@
         return (not self.updatedcount and not self.mergedcount
                 and not self.removedcount and not self.unresolvedcount)
 
-    # TODO remove container emulation once consumers switch to new API.
-
-    def __getitem__(self, x):
-        util.nouideprecwarn('access merge.update() results by name instead of '
-                            'index', '4.6', 2)
-        if x == 0:
-            return self.updatedcount
-        elif x == 1:
-            return self.mergedcount
-        elif x == 2:
-            return self.removedcount
-        elif x == 3:
-            return self.unresolvedcount
-        else:
-            raise IndexError('can only access items 0-3')
-
-    def __len__(self):
-        util.nouideprecwarn('access merge.update() results by name instead of '
-                            'index', '4.6', 2)
-        return 4
-
 def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
     """apply the merge action list to the working directory