hgkw/keyword.py
branch0.9.2compat
changeset 672 0d7642e39cfe
parent 664 c339bd5b183b
child 673 b94f7991f06b
--- a/hgkw/keyword.py	Sat Nov 28 19:51:21 2009 +0000
+++ b/hgkw/keyword.py	Thu Dec 24 10:54:00 2009 +0000
@@ -103,7 +103,8 @@
 
 # hg commands that trigger expansion only when writing to working dir,
 # not when reading filelog, and unexpand when reading from working dir
-restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord'
+restricted = ('merge record resolve qfold qimport qnew qpush qrefresh qrecord'
+              ' transplant')
 
 # provide cvs-like UTC date filter
 def utcdate(date):
@@ -755,7 +756,8 @@
                        changes=changes, opts=opts)
 
     patch_diff = patch.diff
-    patch.diff = kw_diff
+    if not kwt.restrict:
+        patch.diff = kw_diff
 
     try:
         from mercurial.hgweb import webcommands