view mercurial/__init__.py @ 44434:2f290136b7d6

merge: make hg.merge() take a context instead of a node

Many callers already have a repo, so we might as well pass
that. `merge.update()` will look up the context object later. This
patch is part of making it so we pass around the context object all
the way down instead.

I also removed the `repo` argument since it can be retrieved from the
context.

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

# __init__.py - Startup and module loading logic for Mercurial.
#
# Copyright 2015 Gregory Szorc <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

# Allow 'from mercurial import demandimport' to keep working.
import hgdemandimport

demandimport = hgdemandimport