view mercurial/__init__.py @ 47004:3c8e4c6ec9bc stable

merge: stable heads

I forgot to pull before rolling rc1, so we just have a couple of
patches that missed the rc1 train. Mea culpa.

# __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