Change ui inheritance to stay compatible with recent Hg kwmap-templates
authorChristian Ebert <blacktrash@gmx.net>
Fri, 13 Jul 2007 12:56:09 +0200
branchkwmap-templates
changeset 175 f8e5cafa7b99
parent 174 c5f655d5d8b4
child 176 3aed363c9eaf
Change ui inheritance to stay compatible with recent Hg Needed for rollback on interrupted commit.
hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Jul 13 08:43:39 2007 +0200
+++ b/hgkw/keyword.py	Fri Jul 13 12:56:09 2007 +0200
@@ -232,6 +232,7 @@
         return
 
     kwfmatcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
+    ui = repo.ui
 
     class kwrepo(repo.__class__):
         '''
@@ -243,7 +244,7 @@
             if f[0] == '/':
                 f = f[1:]
             if kwfmatcher(f):
-                kwt = kwtemplater(repo.ui, self, path=f)
+                kwt = kwtemplater(ui, self, path=f)
                 return kwfilelog(self.sopener, f, kwt)
             else:
                 return filelog.filelog(self.sopener, f)
@@ -277,7 +278,7 @@
                 if not candidates:
                     return node
 
-                kwt = kwtemplater(repo.ui, self, node=node)
+                kwt = kwtemplater(ui, self, node=node)
                 kwt.overwrite(candidates)
                 return node
             finally: