view .editorconfig @ 37107:71543b942eea

merge: return an attrs class from update() and applyupdates()

Previously, we returned a tuple containing counts. The result of an
update is kind of complex and the use of tuples with nameless fields
made the code a bit harder to read and constrained future expansion
of the return value.

Let's invent an attrs-defined class for representing the result of
an update operation.

We provide __getitem__ and __len__ implementations for backwards
compatibility as a container type to minimize code churn.

In (at least) Python 2, the % operator seems to insist on using
tuples. So we had to update a consumer using the % operator.

.. api::

   merge.update() and merge.applyupdates() now return a class
   with named attributes instead of a tuple. Switch consumers
   to access elements by name instead of by offset.

Differential Revision: https://phab.mercurial-scm.org/D2692

# See http://EditorConfig.org for the specification

root = true

[*.py]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true

[*.{c,h}]
indent_size = 8
indent_style = tab
trim_trailing_whitespace = true