Omit keyword argument for filelog __init__ kwmap-templates
authorChristian Ebert <blacktrash@gmx.net>
Sat, 24 Mar 2007 15:57:07 +0100
branchkwmap-templates
changeset 156 0382bccf861e
parent 155 b62dacbd2166
child 158 900a9e4d7f82
Omit keyword argument for filelog __init__ Make keyword compatible with future changes in Mercurial. Should be safe and backwards compatible as well.
hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Mar 22 12:36:51 2007 +0100
+++ b/hgkw/keyword.py	Sat Mar 24 15:57:07 2007 +0100
@@ -89,12 +89,12 @@
     from mercurial.demandload import * # stable
     from mercurial.i18n import gettext as _
     demandload(globals(), 'mercurial:commands,fancyopts,templater,util')
-    demandload(globals(), 'mercurial:cmdutil,context,filelog,revlog')
+    demandload(globals(), 'mercurial:cmdutil,context,filelog')
     demandload(globals(), 'os re sys time')
 except ImportError:                    # demandimport
     from mercurial.i18n import _
     from mercurial import commands, fancyopts, templater, util
-    from mercurial import cmdutil, context, filelog, revlog
+    from mercurial import cmdutil, context, filelog
     import os, re, sys, time
 
 deftemplates = {
@@ -192,9 +192,8 @@
     Superclass over filelog to customize its read, add, cmp methods.
     Keywords are "stored" unexpanded, and expanded on reading.
     '''
-    def __init__(self, opener, path, kwtemplater,
-                 defversion=revlog.REVLOG_DEFAULT_VERSION):
-        super(kwfilelog, self).__init__(opener, path, defversion)
+    def __init__(self, opener, path, kwtemplater):
+        super(kwfilelog, self).__init__(opener, path)
         self.path = path
         self.kwtemplater = kwtemplater
 
@@ -253,9 +252,9 @@
             # only use kwfilelog when needed
             if self.kwfmatcher(f):
                 kwt = kwtemplater(self.ui, self)
-                return kwfilelog(self.sopener, f, kwt, self.revlogversion)
+                return kwfilelog(self.sopener, f, kwt)
             else:
-                return filelog.filelog(self.sopener, f, self.revlogversion)
+                return filelog.filelog(self.sopener, f)
 
         def commit(self, files=None, text="", user=None, date=None,
                 match=util.always, force=False, lock=None, wlock=None,