--- a/hgkw/keyword.py Tue Dec 16 09:58:41 2008 +0100
+++ b/hgkw/keyword.py Thu Mar 05 06:47:41 2009 +0100
@@ -139,7 +139,7 @@
templatefilters.filters['utcdate'] = utcdate
self.ct = cmdutil.changeset_templater(self.ui, self.repo,
- False, '', False)
+ False, None, '', False)
def substitute(self, data, path, ctx, subfunc):
'''Replaces keywords in data with expanded template.'''
@@ -485,10 +485,10 @@
del wlock, lock
# monkeypatches
- def kwpatchfile_init(orig, self, ui, fname, missing=False):
+ def kwpatchfile_init(orig, self, ui, fname, opener, missing=False):
'''Monkeypatch/wrap patch.patchfile.__init__ to avoid
rejects or conflicts due to expanded keywords in working dir.'''
- orig(self, ui, fname, missing)
+ orig(self, ui, fname, opener, missing)
# shrink keywords read from working dir
self.lines = kwt.shrinklines(self.fname, self.lines)
--- a/tests/test-keyword.out Tue Dec 16 09:58:41 2008 +0100
+++ b/tests/test-keyword.out Thu Mar 05 06:47:41 2009 +0100
@@ -213,15 +213,15 @@
+$Id$
+tests for different changenodes
% qpop
-Patch queue now empty
+patch queue now empty
% qgoto - should imply qpush
applying mqtest.diff
-Now at: mqtest.diff
+now at: mqtest.diff
% cat
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
tests for different changenodes
% qpop and move on
-Patch queue now empty
+patch queue now empty
% copy
% kwfiles added
a
@@ -458,7 +458,7 @@
warning: conflicts during merge.
merging m failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% keyword stays outside conflict zone
$Id$
<<<<<<< local