##// END OF EJS Templates
keyword: make comparison webcommand suppress keyword expansion...
FUJIWARA Katsunori -
r33065:0afdc1a4 default
parent child Browse files
Show More
@@ -121,6 +121,9 b" testedwith = 'ships-with-hg-core'"
121 nokwcommands = ('add addremove annotate bundle export grep incoming init log'
121 nokwcommands = ('add addremove annotate bundle export grep incoming init log'
122 ' outgoing push tip verify convert email glog')
122 ' outgoing push tip verify convert email glog')
123
123
124 # webcommands that do not act on keywords
125 nokwwebcommands = ('annotate changeset rev filediff diff comparison')
126
124 # hg commands that trigger expansion only when writing to working dir,
127 # hg commands that trigger expansion only when writing to working dir,
125 # not when reading filelog, and unexpand when reading from working dir
128 # not when reading filelog, and unexpand when reading from working dir
126 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant'
129 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant'
@@ -763,6 +766,6 b' def reposetup(ui, repo):'
763 extensions.wrapfunction(cmdutil, 'amend', kw_amend)
766 extensions.wrapfunction(cmdutil, 'amend', kw_amend)
764 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
767 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
765 extensions.wrapfunction(cmdutil, 'dorecord', kw_dorecord)
768 extensions.wrapfunction(cmdutil, 'dorecord', kw_dorecord)
766 for c in 'annotate changeset rev filediff diff'.split():
769 for c in nokwwebcommands.split():
767 extensions.wrapfunction(webcommands, c, kwweb_skip)
770 extensions.wrapfunction(webcommands, c, kwweb_skip)
768 repo.__class__ = kwrepo
771 repo.__class__ = kwrepo
@@ -1018,7 +1018,7 b' kwexpand nonexistent'
1018 #if serve
1018 #if serve
1019 hg serve
1019 hg serve
1020 - expand with hgweb file
1020 - expand with hgweb file
1021 - no expansion with hgweb annotate/changeset/filediff
1021 - no expansion with hgweb annotate/changeset/filediff/comparison
1022 - expand with hgweb file, again
1022 - expand with hgweb file, again
1023 - check errors
1023 - check errors
1024
1024
@@ -1079,6 +1079,12 b' hg serve'
1079
1079
1080
1080
1081
1081
1082 $ get-with-headers.py localhost:$HGPORT 'comparison/bb948857c743/a' | grep '\$[a-zA-Z]'
1083 <td class="source equal"><a href="#l1r1"> 1</a> expand $Id$</td>
1084 <td class="source equal"><a href="#l1r1"> 1</a> expand $Id$</td>
1085 <td class="source equal"><a href="#l2r2"> 2</a> do not process $Id:</td>
1086 <td class="source equal"><a href="#l2r2"> 2</a> do not process $Id:</td>
1087 <td class="source insert"><a href="#r4"> 4</a> $Xinfo$</td>
1082
1088
1083 (check "kwweb_skip"-ed webcommand doesn't suppress expanding keywords
1089 (check "kwweb_skip"-ed webcommand doesn't suppress expanding keywords
1084 at subsequent webcommands)
1090 at subsequent webcommands)
General Comments 0
You need to be logged in to leave comments. Login now