Patchwork [4,of,5] merge: drop support for using updateresults as tuples

login
register
mail settings
Submitter Augie Fackler
Date May 11, 2018, 4:55 a.m.
Message ID <35f66e1fc5a74a8009a8.1526014527@imladris.local>
Download mbox | patch
Permalink /patch/31489/
State Accepted
Headers show

Comments

Augie Fackler - May 11, 2018, 4:55 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1526014477 14400
#      Fri May 11 00:54:37 2018 -0400
# Node ID 35f66e1fc5a74a8009a8598c95178c9f6028ae66
# Parent  6e8329574cb80603f0087c95b5b7e1d82cda9ba5
merge: drop support for using updateresults as tuples

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1490,27 +1490,6 @@  class updateresult(object):
         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