comparison mercurial/hg.py @ 37125:6f570c501e3e

merge: deprecate accessing update results by index

Now that we have named attributes, let's convert the code base to use
them. We also add deprecation warnings so legacy consumers are aware
of their transgressions.

``stats.unresolvedcount`` is much easier to read than ``stats[3]``,
don't you think?

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

37124:6715e8035b4f

        if srcpeer is not None:
            srcpeer.close()
    return srcpeer, destpeer

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 update(repo, node, quietempty=False, updatecheck=None):
    """update the working directory to node"""
    stats = updaterepo(repo, node, False, updatecheck=updatecheck)
    _showstats(repo, stats, quietempty)
    if stats[3]:
        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
    return stats[3] > 0

# naming conflict in clone()
_update = update

def clean(repo, node, show_stats=True, quietempty=False):
    """forcibly switch the working directory to node, clobbering changes"""
    stats = updaterepo(repo, node, True)
    repo.vfs.unlinkpath('graftstate', ignoremissing=True)
    if show_stats:
        _showstats(repo, stats, quietempty)
    return stats[3] > 0

# naming conflict in updatetotally()
_clean = clean

def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):

                         " %s\n") % node[:12])
        stats = mergemod.update(repo, node, branchmerge=False, force=True,
                                labels=labels)

    _showstats(repo, stats)
    if stats[3]:
        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                         "or 'hg merge --abort' to abandon\n"))
    elif remind and not abort:
        repo.ui.status(_("(branch merge, don't forget to commit)\n"))
    return stats[3] > 0

def _incoming(displaychlist, subreporecurse, ui, repo, source,
        opts, buffered=False):
    """
    Helper for incoming / gincoming.

37125:6f570c501e3e

        if srcpeer is not None:
            srcpeer.close()
    return srcpeer, destpeer

def _showstats(repo, stats, quietempty=False):
    if quietempty and stats.isempty():
        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 update(repo, node, quietempty=False, updatecheck=None):
    """update the working directory to node"""
    stats = updaterepo(repo, node, False, updatecheck=updatecheck)
    _showstats(repo, stats, quietempty)
    if stats.unresolvedcount:
        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
    return stats.unresolvedcount > 0

# naming conflict in clone()
_update = update

def clean(repo, node, show_stats=True, quietempty=False):
    """forcibly switch the working directory to node, clobbering changes"""
    stats = updaterepo(repo, node, True)
    repo.vfs.unlinkpath('graftstate', ignoremissing=True)
    if show_stats:
        _showstats(repo, stats, quietempty)
    return stats.unresolvedcount > 0

# naming conflict in updatetotally()
_clean = clean

def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):

                         " %s\n") % node[:12])
        stats = mergemod.update(repo, node, branchmerge=False, force=True,
                                labels=labels)

    _showstats(repo, stats)
    if stats.unresolvedcount:
        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                         "or 'hg merge --abort' to abandon\n"))
    elif remind and not abort:
        repo.ui.status(_("(branch merge, don't forget to commit)\n"))
    return stats.unresolvedcount > 0

def _incoming(displaychlist, subreporecurse, ui, repo, source,
        opts, buffered=False):
    """
    Helper for incoming / gincoming.