mercurial/hg.py

43116:defabf63e969

    Extensions can wrap this function and write additional entries to
    destrepo/.hg/shared to indicate additional pieces of data to be shared.
    """
    default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
    if default:
        template = b'[paths]\n' b'default = %s\n'
        destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
    if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements:
        with destrepo.wlock():
            narrowspec.copytoworkingcopy(destrepo)

        node = ms.localctx.hex()
    else:
        # there were no conficts, mergestate was not stored
        node = repo[b'.'].hex()

    repo.ui.status(
        _(b"aborting the merge, updating back to" b" %s\n") % node[:12]
    )
    stats = mergemod.update(repo, node, branchmerge=False, force=True)
    _showstats(repo, stats)
    return stats.unresolvedcount > 0

43117:8ff1ecfadcd1

    Extensions can wrap this function and write additional entries to
    destrepo/.hg/shared to indicate additional pieces of data to be shared.
    """
    default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
    if default:
        template = b'[paths]\ndefault = %s\n'
        destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
    if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements:
        with destrepo.wlock():
            narrowspec.copytoworkingcopy(destrepo)

        node = ms.localctx.hex()
    else:
        # there were no conficts, mergestate was not stored
        node = repo[b'.'].hex()

    repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
    stats = mergemod.update(repo, node, branchmerge=False, force=True)
    _showstats(repo, stats)
    return stats.unresolvedcount > 0