Mercurial > hg
changeset 37959:000039f6ca2d
merge: drop support for using updateresults as tuples (API)
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 11 May 2018 00:54:37 -0400 |
| parents | 14f4449711b8 |
| children | 2f86f259aefa |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 0 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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