##// END OF EJS Templates
keyword: suppress keyword expansion while 'hg unshelve' for internal merge...
FUJIWARA Katsunori -
r21703:99f7e5fe stable
parent child Browse files
Show More
@@ -102,7 +102,8 b" nokwcommands = ('add addremove annotate "
102
102
103 # hg commands that trigger expansion only when writing to working dir,
103 # hg commands that trigger expansion only when writing to working dir,
104 # not when reading filelog, and unexpand when reading from working dir
104 # not when reading filelog, and unexpand when reading from working dir
105 restricted = 'merge kwexpand kwshrink record qrecord resolve transplant'
105 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant'
106 ' unshelve')
106
107
107 # names of extensions using dorecord
108 # names of extensions using dorecord
108 recordextensions = 'record'
109 recordextensions = 'record'
@@ -1137,6 +1137,7 b' Keywords shrunk in working directory, bu'
1137
1137
1138 Now disable keyword expansion
1138 Now disable keyword expansion
1139
1139
1140 $ cp $HGRCPATH $HGRCPATH.backup
1140 $ rm "$HGRCPATH"
1141 $ rm "$HGRCPATH"
1141 $ cat a b
1142 $ cat a b
1142 expand $Id$
1143 expand $Id$
@@ -1152,4 +1153,50 b' Now disable keyword expansion'
1152 ignore $Id$
1153 ignore $Id$
1153 a
1154 a
1154
1155
1156 enable keyword expansion again
1157
1158 $ cat $HGRCPATH.backup >> $HGRCPATH
1159
1160 Test restricted mode with unshelve
1161
1162 $ cat <<EOF >> $HGRCPATH
1163 > [extensions]
1164 > shelve =
1165 > EOF
1166
1167 $ echo xxxx >> a
1168 $ hg diff
1169 diff -r 800511b3a22d a
1170 --- a/a Thu Jan 01 00:00:00 1970 +0000
1171 +++ b/a * (glob)
1172 @@ -2,3 +2,4 @@
1173 do not process $Id:
1174 xxx $
1175 $Xinfo$
1176 +xxxx
1177 $ hg shelve -q --name tmp
1178 $ hg shelve --list --patch
1179 tmp (*) changes to 'localresolve' (glob)
1180
1181 diff --git a/a b/a
1182 --- a/a
1183 +++ b/a
1184 @@ -2,3 +2,4 @@
1185 do not process $Id:
1186 xxx $
1187 $Xinfo$
1188 +xxxx
1189
1190 $ hg update -q -C 10
1191 $ hg unshelve -q tmp
1192 $ hg diff
1193 diff -r 4aa30d025d50 a
1194 --- a/a Thu Jan 01 00:00:00 1970 +0000
1195 +++ b/a * (glob)
1196 @@ -3,3 +3,4 @@
1197 do not process $Id:
1198 xxx $
1199 $Xinfo$
1200 +xxxx
1201
1155 $ cd ..
1202 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now