tests/test-keyword.t
branchstable
changeset 21703 99f7e5fe35f2
parent 18648 76b69cccb07a
child 21704 65dd65c645ed
equal deleted inserted replaced
21701:dedb68a9532c 21703:99f7e5fe35f2
  1135   ignore $Id$
  1135   ignore $Id$
  1136   a
  1136   a
  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$
  1143   do not process $Id:
  1144   do not process $Id:
  1144   xxx $
  1145   xxx $
  1150   xxx $
  1151   xxx $
  1151   $Xinfo$
  1152   $Xinfo$
  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 ..