# HG changeset patch # User Christian Ebert # Date 1261652040 0 # Node ID 0d7642e39cfe64f48f2ebbad9bd0c9b03a3d426f # Parent c339bd5b183b0d9c042a3e8ccfca6aad3c442fb8 (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted See 52b03aad673b, 13a6a2c0440f. diff -r c339bd5b183b -r 0d7642e39cfe hgkw/keyword.py --- 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