comparison mercurial/hg.py @ 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

37106:3d3cff1f6bde

def _showstats(repo, stats, quietempty=False):
    if quietempty and not any(stats):
        return
    repo.ui.status(_("%d files updated, %d files merged, "
                     "%d files removed, %d files unresolved\n") % stats)

def updaterepo(repo, node, overwrite, updatecheck=None):
    """Update the working directory to node.

    When overwrite is set, changes are clobbered, merged else

37107:71543b942eea

def _showstats(repo, stats, quietempty=False):
    if quietempty and not any(stats):
        return
    repo.ui.status(_("%d files updated, %d files merged, "
                     "%d files removed, %d files unresolved\n") % (
                   stats.updatedcount, stats.mergedcount,
                   stats.removedcount, stats.unresolvedcount))

def updaterepo(repo, node, overwrite, updatecheck=None):
    """Update the working directory to node.

    When overwrite is set, changes are clobbered, merged else