988 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
988 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
989 3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3 |
989 3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3 |
990 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1 |
990 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1 |
991 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
991 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
992 |
992 |
993 BROKEN: should follow history |
|
994 BROKEN: should not abort because of removed file |
993 BROKEN: should not abort because of removed file |
995 $ hg grep --diff -fr'wdir()' data |
994 $ hg grep --diff -fr'wdir()' data |
996 add0-cp4-mod4:2147483647:+:data4 |
995 add0-cp4-mod4:2147483647:+:data4 |
997 add0-mod4:2147483647:+:data4 |
996 add0-mod4:2147483647:+:data4 |
998 add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest! |
997 add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest! |
1061 $ hg log -fr'1+2' |
1060 $ hg log -fr'1+2' |
1062 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1061 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1063 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1 |
1062 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1 |
1064 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1063 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1065 |
1064 |
1066 BROKEN: should include the revision 1 |
|
1067 $ hg grep --diff -fr'1+2' data |
1065 $ hg grep --diff -fr'1+2' data |
1068 add0-cp2-mod2:2:+:data2 |
1066 add0-cp2-mod2:2:+:data2 |
1069 add0-mod2:2:+:data2 |
1067 add0-mod2:2:+:data2 |
|
1068 add0-cp1-mod1:1:+:data1 |
|
1069 add0-cp1-mod1-rm3:1:+:data1 |
|
1070 add0-mod1:1:+:data1 |
1070 add0:0:+:data0 |
1071 add0:0:+:data0 |
1071 add0-mod1:0:+:data0 |
1072 add0-mod1:0:+:data0 |
1072 add0-mod2:0:+:data0 |
1073 add0-mod2:0:+:data0 |
1073 add0-mod3:0:+:data0 |
1074 add0-mod3:0:+:data0 |
1074 add0-mod4:0:+:data0 |
1075 add0-mod4:0:+:data0 |
1075 add0-rm1:0:+:data0 |
1076 add0-rm1:0:+:data0 |
1076 add0-rm2:0:+:data0 |
1077 add0-rm2:0:+:data0 |
1077 add0-rm4:0:+:data0 |
1078 add0-rm4:0:+:data0 |
1078 |
1079 |
1079 BROKEN: should include the revision 1 |
|
1080 $ hg grep -fr'1+2' data |
1080 $ hg grep -fr'1+2' data |
1081 add0:2:data0 |
1081 add0:2:data0 |
1082 add0-cp2:2:data0 |
1082 add0-cp2:2:data0 |
1083 add0-cp2-mod2:2:data0 |
1083 add0-cp2-mod2:2:data0 |
1084 add0-cp2-mod2:2:data2 |
1084 add0-cp2-mod2:2:data2 |
1122 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1133 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1123 |
1134 |
1124 $ hg grep --diff -f data add0-mod4 |
1135 $ hg grep --diff -f data add0-mod4 |
1125 add0-mod4:0:+:data0 |
1136 add0-mod4:0:+:data0 |
1126 |
1137 |
1127 BROKEN: should not include the revision 2 |
|
1128 $ hg grep -f data add0-mod4 |
1138 $ hg grep -f data add0-mod4 |
1129 add0-mod4:3:data0 |
1139 add0-mod4:3:data0 |
1130 add0-mod4:2:data0 |
|
1131 add0-mod4:1:data0 |
1140 add0-mod4:1:data0 |
1132 add0-mod4:0:data0 |
1141 add0-mod4:0:data0 |
1133 |
1142 |
1134 follow file history from wdir parent, copied but unmodified: |
1143 follow file history from wdir parent, copied but unmodified: |
1135 |
1144 |
1168 $ hg log -f add0-cp4 |
1177 $ hg log -f add0-cp4 |
1169 abort: cannot follow nonexistent file: "add0-cp4" |
1178 abort: cannot follow nonexistent file: "add0-cp4" |
1170 [255] |
1179 [255] |
1171 |
1180 |
1172 $ hg grep --diff -f data add0-cp4 |
1181 $ hg grep --diff -f data add0-cp4 |
1173 abort: cannot follow file not in parent revision: "add0-cp4" |
1182 abort: cannot follow nonexistent file: "add0-cp4" |
1174 [255] |
1183 [255] |
1175 |
1184 |
1176 BROKEN: maybe better to abort |
1185 BROKEN: maybe better to abort |
1177 $ hg grep -f data add0-cp4 |
1186 $ hg grep -f data add0-cp4 |
1178 [1] |
1187 [1] |
1197 $ hg log -fr. add0-cp1-mod1-rm3 |
1206 $ hg log -fr. add0-cp1-mod1-rm3 |
1198 abort: cannot follow file not in any of the specified revisions: "add0-cp1-mod1-rm3" |
1207 abort: cannot follow file not in any of the specified revisions: "add0-cp1-mod1-rm3" |
1199 [255] |
1208 [255] |
1200 |
1209 |
1201 $ hg grep --diff -fr. data add0-cp1-mod1-rm3 |
1210 $ hg grep --diff -fr. data add0-cp1-mod1-rm3 |
1202 abort: cannot follow file not in parent revision: "add0-cp1-mod1-rm3" |
1211 abort: cannot follow file not in any of the specified revisions: "add0-cp1-mod1-rm3" |
1203 [255] |
1212 [255] |
1204 |
1213 |
1205 BROKEN: should abort |
1214 BROKEN: should abort |
1206 $ hg grep -fr. data add0-cp1-mod1-rm3 |
1215 $ hg grep -fr. data add0-cp1-mod1-rm3 |
1207 add0-cp1-mod1-rm3:1:data0 |
1216 add0-cp1-mod1-rm3:1:data0 |
1211 |
1220 |
1212 $ hg log -f add0-rm4 |
1221 $ hg log -f add0-rm4 |
1213 abort: cannot follow file not in parent revision: "add0-rm4" |
1222 abort: cannot follow file not in parent revision: "add0-rm4" |
1214 [255] |
1223 [255] |
1215 |
1224 |
1216 BROKEN: may be okay, but different behavior from "hg log" |
|
1217 $ hg grep --diff -f data add0-rm4 |
1225 $ hg grep --diff -f data add0-rm4 |
1218 add0-rm4:0:+:data0 |
1226 abort: cannot follow file not in parent revision: "add0-rm4" |
1219 |
1227 [255] |
1220 BROKEN: should not include the revision 2, and maybe better to abort |
1228 |
|
1229 BROKEN: should abort |
1221 $ hg grep -f data add0-rm4 |
1230 $ hg grep -f data add0-rm4 |
1222 add0-rm4:3:data0 |
1231 add0-rm4:3:data0 |
1223 add0-rm4:2:data0 |
|
1224 add0-rm4:1:data0 |
1232 add0-rm4:1:data0 |
1225 add0-rm4:0:data0 |
1233 add0-rm4:0:data0 |
1226 |
1234 |
1227 follow file history from wdir parent (explicit), removed in wdir: |
1235 follow file history from wdir parent (explicit), removed in wdir: |
1228 |
1236 |
1248 add0-mod3:3:+:data3 |
1256 add0-mod3:3:+:data3 |
1249 add0-cp1-mod1:1:+:data1 |
1257 add0-cp1-mod1:1:+:data1 |
1250 add0:0:+:data0 |
1258 add0:0:+:data0 |
1251 add0-mod3:0:+:data0 |
1259 add0-mod3:0:+:data0 |
1252 |
1260 |
1253 BROKEN: should not include the revision 2 |
|
1254 BROKEN: should follow history across renames |
1261 BROKEN: should follow history across renames |
1255 $ hg grep -f data add0-mod3 add0-cp1-mod1 |
1262 $ hg grep -f data add0-mod3 add0-cp1-mod1 |
1256 add0-cp1-mod1:3:data0 |
1263 add0-cp1-mod1:3:data0 |
1257 add0-cp1-mod1:3:data1 |
1264 add0-cp1-mod1:3:data1 |
1258 add0-mod3:3:data0 |
1265 add0-mod3:3:data0 |
1259 add0-mod3:3:data3 |
1266 add0-mod3:3:data3 |
1260 add0-mod3:2:data0 |
|
1261 add0-cp1-mod1:1:data0 |
1267 add0-cp1-mod1:1:data0 |
1262 add0-cp1-mod1:1:data1 |
1268 add0-cp1-mod1:1:data1 |
1263 add0-mod3:1:data0 |
1269 add0-mod3:1:data0 |
1264 add0-mod3:0:data0 |
1270 add0-mod3:0:data0 |
1265 |
1271 |
1267 |
1273 |
1268 $ hg log -fr2 add0-mod2 |
1274 $ hg log -fr2 add0-mod2 |
1269 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1275 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1270 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1276 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1271 |
1277 |
1272 BROKEN: should include the revision 2 |
|
1273 $ hg grep --diff -fr2 data add0-mod2 |
1278 $ hg grep --diff -fr2 data add0-mod2 |
|
1279 add0-mod2:2:+:data2 |
1274 add0-mod2:0:+:data0 |
1280 add0-mod2:0:+:data0 |
1275 |
1281 |
1276 $ hg grep -fr2 data add0-mod2 |
1282 $ hg grep -fr2 data add0-mod2 |
1277 add0-mod2:2:data0 |
1283 add0-mod2:2:data0 |
1278 add0-mod2:2:data2 |
1284 add0-mod2:2:data2 |
1282 |
1288 |
1283 $ hg log -fr2 add0-cp2 |
1289 $ hg log -fr2 add0-cp2 |
1284 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1290 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1285 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1291 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1286 |
1292 |
1287 BROKEN: should follow history from the specified revision |
|
1288 $ hg grep --diff -fr2 data add0-cp2 |
1293 $ hg grep --diff -fr2 data add0-cp2 |
1289 abort: cannot follow file not in parent revision: "add0-cp2" |
1294 add0:0:+:data0 |
1290 [255] |
|
1291 |
1295 |
1292 BROKEN: should follow history across renames |
1296 BROKEN: should follow history across renames |
1293 $ hg grep -fr2 data add0-cp2 |
1297 $ hg grep -fr2 data add0-cp2 |
1294 add0-cp2:2:data0 |
1298 add0-cp2:2:data0 |
1295 |
1299 |
1297 |
1301 |
1298 $ hg log -fr2 add0-cp2-mod2 |
1302 $ hg log -fr2 add0-cp2-mod2 |
1299 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1303 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1300 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1304 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1301 |
1305 |
1302 BROKEN: should follow history from the specified revision |
|
1303 $ hg grep --diff -fr2 data add0-cp2-mod2 |
1306 $ hg grep --diff -fr2 data add0-cp2-mod2 |
1304 abort: cannot follow file not in parent revision: "add0-cp2-mod2" |
1307 add0-cp2-mod2:2:+:data2 |
1305 [255] |
1308 add0:0:+:data0 |
1306 |
1309 |
1307 BROKEN: should follow history across renames |
1310 BROKEN: should follow history across renames |
1308 $ hg grep -fr2 data add0-cp2-mod2 |
1311 $ hg grep -fr2 data add0-cp2-mod2 |
1309 add0-cp2-mod2:2:data0 |
1312 add0-cp2-mod2:2:data0 |
1310 add0-cp2-mod2:2:data2 |
1313 add0-cp2-mod2:2:data2 |
1313 |
1316 |
1314 $ hg log -fr2 add0-rm2 |
1317 $ hg log -fr2 add0-rm2 |
1315 abort: cannot follow file not in any of the specified revisions: "add0-rm2" |
1318 abort: cannot follow file not in any of the specified revisions: "add0-rm2" |
1316 [255] |
1319 [255] |
1317 |
1320 |
1318 BROKEN: should abort |
|
1319 $ hg grep --diff -fr2 data add0-rm2 |
1321 $ hg grep --diff -fr2 data add0-rm2 |
1320 add0-rm2:0:+:data0 |
1322 abort: cannot follow file not in any of the specified revisions: "add0-rm2" |
|
1323 [255] |
1321 |
1324 |
1322 BROKEN: should abort |
1325 BROKEN: should abort |
1323 $ hg grep -fr2 data add0-rm2 |
1326 $ hg grep -fr2 data add0-rm2 |
1324 add0-rm2:0:data0 |
1327 add0-rm2:0:data0 |
1325 |
1328 |
1327 |
1330 |
1328 $ hg log -fr2 add0-cp2 add0-mod2 |
1331 $ hg log -fr2 add0-cp2 add0-mod2 |
1329 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1332 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2 |
1330 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1333 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1331 |
1334 |
1332 BROKEN: should follow history from the specified revision |
|
1333 $ hg grep --diff -fr2 data add0-cp2 add0-mod2 |
1335 $ hg grep --diff -fr2 data add0-cp2 add0-mod2 |
1334 abort: cannot follow file not in parent revision: "add0-cp2" |
1336 add0-mod2:2:+:data2 |
1335 [255] |
1337 add0:0:+:data0 |
|
1338 add0-mod2:0:+:data0 |
1336 |
1339 |
1337 BROKEN: should follow history across renames |
1340 BROKEN: should follow history across renames |
1338 $ hg grep -fr2 data add0-cp2 add0-mod2 |
1341 $ hg grep -fr2 data add0-cp2 add0-mod2 |
1339 add0-cp2:2:data0 |
1342 add0-cp2:2:data0 |
1340 add0-mod2:2:data0 |
1343 add0-mod2:2:data0 |
1364 |
1367 |
1365 $ hg log -fr'wdir()' add0-mod4 |
1368 $ hg log -fr'wdir()' add0-mod4 |
1366 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1369 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1367 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1370 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1368 |
1371 |
1369 BROKEN: should include the changes in wdir |
|
1370 $ hg grep --diff -fr'wdir()' data add0-mod4 |
1372 $ hg grep --diff -fr'wdir()' data add0-mod4 |
|
1373 add0-mod4:2147483647:+:data4 |
1371 add0-mod4:0:+:data0 |
1374 add0-mod4:0:+:data0 |
1372 |
1375 |
1373 $ hg grep -fr'wdir()' data add0-mod4 |
1376 $ hg grep -fr'wdir()' data add0-mod4 |
1374 add0-mod4:2147483647:data0 |
1377 add0-mod4:2147483647:data0 |
1375 add0-mod4:2147483647:data4 |
1378 add0-mod4:2147483647:data4 |
1381 |
1384 |
1382 $ hg log -fr'wdir()' add0-cp4 |
1385 $ hg log -fr'wdir()' add0-cp4 |
1383 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1386 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1384 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1387 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1385 |
1388 |
1386 BROKEN: should follow history |
|
1387 $ hg grep --diff -fr'wdir()' data add0-cp4 |
1389 $ hg grep --diff -fr'wdir()' data add0-cp4 |
1388 abort: cannot follow file not in parent revision: "add0-cp4" |
1390 add0:0:+:data0 |
1389 [255] |
|
1390 |
1391 |
1391 BROKEN: should follow history across renames |
1392 BROKEN: should follow history across renames |
1392 $ hg grep -fr'wdir()' data add0-cp4 |
1393 $ hg grep -fr'wdir()' data add0-cp4 |
1393 add0-cp4:2147483647:data0 |
1394 add0-cp4:2147483647:data0 |
1394 |
1395 |
1396 |
1397 |
1397 $ hg log -fr'wdir()' add0-cp4-mod4 |
1398 $ hg log -fr'wdir()' add0-cp4-mod4 |
1398 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1399 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1399 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1400 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1400 |
1401 |
1401 BROKEN: should follow history |
|
1402 $ hg grep --diff -fr'wdir()' data add0-cp4-mod4 |
1402 $ hg grep --diff -fr'wdir()' data add0-cp4-mod4 |
1403 abort: cannot follow file not in parent revision: "add0-cp4-mod4" |
1403 add0-cp4-mod4:2147483647:+:data4 |
1404 [255] |
1404 add0:0:+:data0 |
1405 |
1405 |
1406 BROKEN: should follow history across renames |
1406 BROKEN: should follow history across renames |
1407 $ hg grep -fr'wdir()' data add0-cp4-mod4 |
1407 $ hg grep -fr'wdir()' data add0-cp4-mod4 |
1408 add0-cp4-mod4:2147483647:data0 |
1408 add0-cp4-mod4:2147483647:data0 |
1409 add0-cp4-mod4:2147483647:data4 |
1409 add0-cp4-mod4:2147483647:data4 |
1413 $ hg log -fr'wdir()' add0-cp4 add0-mod4 add0-mod3 |
1413 $ hg log -fr'wdir()' add0-cp4 add0-mod4 add0-mod3 |
1414 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1414 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4 |
1415 3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3 |
1415 3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3 |
1416 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1416 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 |
1417 |
1417 |
1418 BROKEN: should follow history |
|
1419 $ hg grep --diff -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3 |
1418 $ hg grep --diff -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3 |
1420 abort: cannot follow file not in parent revision: "add0-cp4" |
1419 add0-mod4:2147483647:+:data4 |
1421 [255] |
1420 add0-mod3:3:+:data3 |
|
1421 add0:0:+:data0 |
|
1422 add0-mod3:0:+:data0 |
|
1423 add0-mod4:0:+:data0 |
1422 |
1424 |
1423 BROKEN: should follow history across renames |
1425 BROKEN: should follow history across renames |
1424 $ hg grep -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3 |
1426 $ hg grep -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3 |
1425 add0-cp4:2147483647:data0 |
1427 add0-cp4:2147483647:data0 |
1426 add0-mod3:2147483647:data0 |
1428 add0-mod3:2147483647:data0 |