[PATCH 1 of 1] keyword: remove mq commands from restricted list

Christian Ebert blacktrash at gmx.net
Mon Apr 19 07:50:22 CDT 2010


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1271681361 -7200
# Node ID 9d0f78322e95991a81b1b5c0c0073901bbbe3b52
# Parent  5f10634f9e68873eade54bc0a5408ee9e26b55d8
keyword: remove mq commands from restricted list

Monkeypatching patch.diff takes care of this since 911f5be5d159.

Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -92,8 +92,7 @@
 
 # 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'
-              ' transplant')
+restricted = 'merge record qrecord resolve transplant'
 
 # provide cvs-like UTC date filter
 utcdate = lambda x: util.datestr((x[0], 0), '%Y/%m/%d %H:%M:%S')


More information about the Mercurial-devel mailing list