Rev 27: Merge Tim Hatch's demandimport disabling patch. in http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

------------------------------------------------------------
revno: 27
revision-id: robertc at robertcollins.net-20071112165803-14wo3m3gl9d0cy2m
parent: robertc at robertcollins.net-20070711151717-1yookaori2o2efsp
parent: tim at timhatch.com-20070720155959-r9suv56yw9fx0tiu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2007-11-13 03:58:03 +1100
message:
  Merge Tim Hatch's demandimport disabling patch.
modified:
  __init__.py                    __init__.py-20060531211707-2fy7rwqqcmfgf8ve-1
    ------------------------------------------------------------
    revno: 26.1.1
    revision-id: tim at timhatch.com-20070720155959-r9suv56yw9fx0tiu
    parent: robertc at robertcollins.net-20070711151717-1yookaori2o2efsp
    committer: Tim Hatch <tim at timhatch.com>
    branch nick: bzr-hg
    timestamp: Fri 2007-07-20 10:59:59 -0500
    message:
      Disable demandimport in Mercurial >= 0.9.4
    modified:
      __init__.py                    __init__.py-20060531211707-2fy7rwqqcmfgf8ve-1
=== modified file '__init__.py'
--- a/__init__.py	2007-07-11 14:56:50 +0000
+++ b/__init__.py	2007-07-20 15:59:59 +0000
@@ -31,6 +31,12 @@
 import os
 import stat
 
+try:
+    from mercurial import demandimport
+    demandimport.enable = lambda: None
+except ImportError:
+    pass
+
 import mercurial.commands
 import mercurial.cmdutil
 import mercurial.hg