# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1229522120 -3600
# Node ID 55b462bc9343d55eedf9622e8d6e1d219793ae77
# Parent  9ea5ac3258b6c5549fa53dc94295dde0af192762# Parent  3fef0be9f5504e0d5422716520f27c550b47917c
(stable) merge with default

diff -r 9ea5ac3258b6 -r 55b462bc9343 hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Sep 28 20:40:38 2008 +0200
+++ b/hgkw/keyword.py	Wed Dec 17 14:55:20 2008 +0100
@@ -427,14 +427,10 @@
     keyword substitutions.
     Monkeypatches patch and webcommands.'''
 
-    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
+    if (not hasattr(repo, 'dirstate') or not kwtools['inc']
+        or kwtools['hgcmd'] in nokwcommands.split()
+        or '.hg' in util.splitpath(repo.root)):
+        return
 
     kwtools['templater'] = kwt = kwtemplater(ui, repo)