--- a/hgkw/keyword.py	Thu Jun 26 13:46:34 2008 -0500
+++ b/hgkw/keyword.py	Thu Jun 26 14:35:46 2008 -0500
@@ -174,12 +174,12 @@
     def overwrite(self, node, expand, files):
         '''Overwrites selected files expanding/shrinking keywords.'''
         if node is not None:     # commit
-            ctx = self.repo.changectx(node)
+            ctx = self.repo[node]
             mf = ctx.manifest()
             files = [f for f in ctx.files() if f in mf]
             notify = self.ui.debug
         else:                    # kwexpand/kwshrink
-            ctx = self.repo.changectx('.')
+            ctx = self.repo['.']
             mf = ctx.manifest()
             notify = self.ui.note
         candidates = [f for f in files if self.iskwfile(f, mf.linkf)]
@@ -388,7 +388,7 @@
     if opts.get('untracked'):
         files += unknown
     files.sort()
-    wctx = repo.changectx(None)
+    wctx = repo[None]
     islink = lambda p: 'l' in wctx.flags(p)
     kwfiles = [f for f in files if kwt.iskwfile(f, islink)]
     cwd = pats and repo.getcwd() or ''
@@ -515,7 +515,7 @@
         comparing against working dir.'''
         if node2 is not None:
             kwt.matcher = util.never
-        elif node1 is not None and node1 != repo.changectx('.').node():
+        elif node1 is not None and node1 != repo['.'].node():
             kwt.restrict = True
         patch_diff(repo, node1, node2, match, fp, changes, opts)