# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1312887403 -7200
# Node ID d487504115fefcf8245e7b2eadbe24a9e7335884
# Parent  a50ed14997fc1e9d2d285e8f74b125ac65fcd741# Parent  6cabb1c47f214fc0dad30240bcf0823f4c5906db
Merge with default

diff -r a50ed14997fc -r d487504115fe hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Jul 25 16:37:18 2011 -0500
+++ b/hgkw/keyword.py	Tue Aug 09 12:56:43 2011 +0200
@@ -249,10 +249,15 @@
         kwcmd = self.restrict and lookup # kwexpand/kwshrink
         if self.restrict or expand and lookup:
             mf = ctx.manifest()
+        if self.restrict or rekw:
+            re_kw = self.rekw
+        else:
+            re_kw = self.rekwexp
+        if expand:
+            msg = _('overwriting %s expanding keywords\n')
+        else:
+            msg = _('overwriting %s shrinking keywords\n')
         lctx = ctx
-        re_kw = (self.restrict or rekw) and self.rekw or self.rekwexp
-        msg = (expand and _('overwriting %s expanding keywords\n')
-               or _('overwriting %s shrinking keywords\n'))
         for f in candidates:
             if self.restrict:
                 data = self.repo.file(f).read(mf[f])
@@ -293,7 +298,9 @@
     def wread(self, fname, data):
         '''If in restricted mode returns data read from wdir with
         keyword substitutions removed.'''
-        return self.restrict and self.shrink(fname, data) or data
+        if self.restrict:
+            return self.shrink(fname, data)
+        return data
 
 class kwfilelog(filelog.filelog):
     '''
@@ -412,7 +419,10 @@
                 ui.setconfig('keywordmaps', k, v)
     else:
         ui.status(_('\n\tconfiguration using current keyword template maps\n'))
-        kwmaps = dict(uikwmaps) or _defaultkwmaps(ui)
+        if uikwmaps:
+            kwmaps = dict(uikwmaps)
+        else:
+            kwmaps = _defaultkwmaps(ui)
 
     uisetup(ui)
     reposetup(ui, repo)