915 3 largefiles updated, 0 removed |
915 3 largefiles updated, 0 removed |
916 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
916 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
917 $ cd d |
917 $ cd d |
918 |
918 |
919 More rebase testing, but also test that the largefiles are downloaded from |
919 More rebase testing, but also test that the largefiles are downloaded from |
920 'default' instead of 'default-push' when no source is specified (issue3584). |
920 'default-push' when no source is specified (issue3584). (The largefile from the |
921 The error messages go away if repo 'b' is created with --all-largefiles. |
921 pulled revision is however not downloaded but found in the local cache.) |
|
922 Largefiles are fetched for the new pulled revision, not for existing revisions, |
|
923 rebased or not. |
|
924 |
|
925 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
922 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b |
926 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b |
923 pulling from $TESTTMP/b (glob) |
927 pulling from $TESTTMP/b (glob) |
924 searching for changes |
928 searching for changes |
925 adding changesets |
929 adding changesets |
926 adding manifests |
930 adding manifests |
928 added 1 changesets with 2 changes to 2 files (+1 heads) |
932 added 1 changesets with 2 changes to 2 files (+1 heads) |
929 Invoking status precommit hook |
933 Invoking status precommit hook |
930 M sub/normal4 |
934 M sub/normal4 |
931 M sub2/large6 |
935 M sub2/large6 |
932 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
936 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
933 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally (glob) |
|
934 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally (glob) |
|
935 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally (glob) |
|
936 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob) |
|
937 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob) |
|
938 error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally (glob) |
|
939 error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob) |
|
940 error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally (glob) |
|
941 error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob) |
|
942 0 additional largefiles cached |
937 0 additional largefiles cached |
943 9 largefiles failed to download |
|
944 nothing to rebase |
938 nothing to rebase |
|
939 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
945 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
940 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
946 9:598410d3eb9a modify normal file largefile in repo d |
941 9:598410d3eb9a modify normal file largefile in repo d |
947 8:a381d2c8c80e modify normal file and largefile in repo b |
942 8:a381d2c8c80e modify normal file and largefile in repo b |
948 7:daea875e9014 add/edit more largefiles |
943 7:daea875e9014 add/edit more largefiles |
949 6:4355d653f84f edit files yet again |
944 6:4355d653f84f edit files yet again |
1227 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) |
1222 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) |
1228 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1223 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1229 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1224 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1230 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1225 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1231 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
1226 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
|
1227 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c |
|
1228 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 |
|
1229 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
1232 [1] |
1230 [1] |
1233 |
1231 |
1234 - cleanup |
1232 - cleanup |
1235 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
1233 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
|
1234 $ rm -f .hglf/sub/*.orig |
|
1235 |
|
1236 Update to revision with missing largefile - and make sure it really is missing |
|
1237 |
|
1238 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
|
1239 $ hg up -r 6 |
|
1240 getting changed largefiles |
|
1241 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob) |
|
1242 1 largefiles updated, 2 removed |
|
1243 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1244 $ rm normal3 |
|
1245 $ echo >> sub/normal4 |
|
1246 $ hg ci -m 'commit with missing files' |
|
1247 Invoking status precommit hook |
|
1248 M sub/normal4 |
|
1249 ! large3 |
|
1250 ! normal3 |
|
1251 created new head |
|
1252 $ hg st |
|
1253 ! large3 |
|
1254 ! normal3 |
|
1255 $ hg up -r. |
|
1256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1257 $ hg st |
|
1258 ! large3 |
|
1259 ! normal3 |
|
1260 $ hg up -Cr. |
|
1261 getting changed largefiles |
|
1262 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob) |
|
1263 0 largefiles updated, 0 removed |
|
1264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1265 $ hg st |
|
1266 ! large3 |
|
1267 $ hg rollback |
|
1268 repository tip rolled back to revision 9 (undo commit) |
|
1269 working directory now based on revision 6 |
|
1270 |
|
1271 Merge with revision with missing largefile - and make sure it tries to fetch it. |
|
1272 |
|
1273 $ hg up -Cqr null |
|
1274 $ echo f > f |
|
1275 $ hg ci -Am branch |
|
1276 adding f |
|
1277 Invoking status precommit hook |
|
1278 A f |
|
1279 created new head |
|
1280 $ hg merge -r 6 |
|
1281 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1282 (branch merge, don't forget to commit) |
|
1283 getting changed largefiles |
|
1284 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob) |
|
1285 1 largefiles updated, 0 removed |
|
1286 |
|
1287 $ hg rollback -q |
|
1288 $ hg up -Cq |
|
1289 |
|
1290 Pulling 0 revisions with --all-largefiles should not fetch for all revisions |
|
1291 |
|
1292 $ hg pull --all-largefiles |
|
1293 pulling from $TESTTMP/d (glob) |
|
1294 searching for changes |
|
1295 no changes found |
|
1296 0 additional largefiles cached |
1236 |
1297 |
1237 Merging does not revert to old versions of largefiles and also check |
1298 Merging does not revert to old versions of largefiles and also check |
1238 that merging after having pulled from a non-default remote works |
1299 that merging after having pulled from a non-default remote works |
1239 correctly. |
1300 correctly. |
1240 |
1301 |