# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1394709572 0
# Node ID d9c3f8002e7c0d774ed1643222b2d1bad8e091da
# Parent  9dcd045229b427da50a71d3dd7b2ee5b0c1ff3a4# Parent  238b6ca6d2bb0c74a68dbe34ee4885942a41bad2
Merge with stable

diff -r 9dcd045229b4 -r d9c3f8002e7c hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Mar 04 17:24:44 2014 +0000
+++ b/hgkw/keyword.py	Thu Mar 13 11:19:32 2014 +0000
@@ -217,9 +217,8 @@
         '''Replaces keywords in data with expanded template.'''
         def kwsub(mobj):
             kw = mobj.group(1)
-            ct = cmdutil.changeset_templater(self.ui, self.repo,
-                                             False, None, '', False)
-            ct.use_template(self.templates[kw])
+            ct = cmdutil.changeset_templater(self.ui, self.repo, False, None,
+                                             self.templates[kw], '', False)
             self.ui.pushbuffer()
             ct.show(ctx, root=self.repo.root, file=path)
             ekw = templatefilters.firstline(self.ui.popbuffer())
diff -r 9dcd045229b4 -r d9c3f8002e7c tests/run-tests.py
--- a/tests/run-tests.py	Tue Mar 04 17:24:44 2014 +0000
+++ b/tests/run-tests.py	Thu Mar 13 11:19:32 2014 +0000
@@ -479,10 +479,10 @@
            ' build %(compiler)s --build-base="%(base)s"'
            ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
            ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
-           % dict(exe=sys.executable, py3=py3, pure=pure, compiler=compiler,
-                  base=os.path.join(HGTMP, "build"),
-                  prefix=INST, libdir=PYTHONDIR, bindir=BINDIR,
-                  nohome=nohome, logfile=installerrs))
+           % {'exe': sys.executable, 'py3': py3, 'pure': pure,
+              'compiler': compiler, 'base': os.path.join(HGTMP, "build"),
+              'prefix': INST, 'libdir': PYTHONDIR, 'bindir': BINDIR,
+              'nohome': nohome, 'logfile': installerrs})
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not options.verbose: