--- a/hgext/keyword.py	Fri Mar 13 21:14:57 2009 +0100
+++ b/hgext/keyword.py	Tue Mar 17 13:43:11 2009 -0500
@@ -425,10 +425,14 @@
     keyword substitutions.
     Monkeypatches patch and webcommands.'''
 
-    if (not hasattr(repo, 'dirstate') or not kwtools['inc']
-        or kwtools['hgcmd'] in nokwcommands.split()
-        or '.hg' in util.splitpath(repo.root)):
-        return
+    try:
+        if (not repo.local() or not kwtools['inc']
+            or kwtools['hgcmd'] in nokwcommands.split()
+            or '.hg' in util.splitpath(repo.root)
+            or repo._url.startswith('bundle:')):
+            return
+    except AttributeError:
+        pass
 
     kwtools['templater'] = kwt = kwtemplater(ui, repo)