--- a/hgkw/keyword.py	Fri Jun 13 17:41:26 2008 +0200
+++ b/hgkw/keyword.py	Mon Jun 30 12:33:36 2008 +0200
@@ -85,7 +85,7 @@
         Or, better, use bundle/unbundle to share changes.
 '''
 
-from mercurial import commands, cmdutil, context, fancyopts, filelog
+from mercurial import commands, cmdutil, fancyopts, filelog
 from mercurial import localrepo, patch, revlog, templater, util
 from mercurial.node import nullid, hex
 from mercurial.i18n import gettext as _
@@ -282,7 +282,7 @@
     def getnode(self, path, fnode):
         '''Derives changenode from file path and filenode.'''
         # used by kwfilelog.read and kwexpand
-        c = context.filectx(self.repo, path, fileid=fnode)
+        c = self.repo.filectx(path, fileid=fnode)
         return c.node()
 
     def substitute(self, data, path, node, subfunc):