| indygreg |
| hg-reviewers |
Oops, we forgot to register data file when blanky copying revlog. Now that we
are actually copying these .d files, we should also register them.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/upgrade.py (5 lines) | |||
| M | tests/test-upgrade-repo.t (6 lines) |
| newindex = newvfs.join(newrl.indexfile) | newindex = newvfs.join(newrl.indexfile) | ||||
| olddata = oldvfs.join(oldrl.datafile) | olddata = oldvfs.join(oldrl.datafile) | ||||
| newdata = newvfs.join(newrl.datafile) | newdata = newvfs.join(newrl.datafile) | ||||
| with newvfs(newrl.indexfile, 'w'): | with newvfs(newrl.indexfile, 'w'): | ||||
| pass # create all the directories | pass # create all the directories | ||||
| util.copyfile(oldindex, newindex) | util.copyfile(oldindex, newindex) | ||||
| if oldrl.opener.exists(oldrl.datafile): | copydata = oldrl.opener.exists(oldrl.datafile) | ||||
| if copydata: | |||||
| util.copyfile(olddata, newdata) | util.copyfile(olddata, newdata) | ||||
| if not (unencodedname.endswith('00changelog.i') | if not (unencodedname.endswith('00changelog.i') | ||||
| or unencodedname.endswith('00manifest.i')): | or unencodedname.endswith('00manifest.i')): | ||||
| destrepo.svfs.fncache.add(unencodedname) | destrepo.svfs.fncache.add(unencodedname) | ||||
| if copydata: | |||||
| destrepo.svfs.fncache.add(unencodedname[:-2] + '.d') | |||||
| UPGRADE_CHANGELOG = object() | UPGRADE_CHANGELOG = object() | ||||
| UPGRADE_MANIFEST = object() | UPGRADE_MANIFEST = object() | ||||
| UPGRADE_FILELOG = object() | UPGRADE_FILELOG = object() | ||||
| UPGRADE_ALL_REVLOGS = frozenset([UPGRADE_CHANGELOG, | UPGRADE_ALL_REVLOGS = frozenset([UPGRADE_CHANGELOG, | ||||
| UPGRADE_MANIFEST, | UPGRADE_MANIFEST, | ||||
| UPGRADE_FILELOG]) | UPGRADE_FILELOG]) | ||||
| $ hg verify | $ hg verify | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| warning: revlog 'data/f2.d' not in fncache! | |||||
| checked 3 changesets with 3 changes to 3 files | checked 3 changesets with 3 changes to 3 files | ||||
| 1 warnings encountered! | |||||
| hint: run "hg debugrebuildfncache" to recover from corrupt fncache | |||||
| Check we can select negatively | Check we can select negatively | ||||
| $ hg debugupgrade --optimize re-delta-parent --run --no-manifest --no-backup --debug --traceback | $ hg debugupgrade --optimize re-delta-parent --run --no-manifest --no-backup --debug --traceback | ||||
| upgrade will perform the following actions: | upgrade will perform the following actions: | ||||
| requirements | requirements | ||||
| preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | ||||
| finalizing requirements file and making repository readable again | finalizing requirements file and making repository readable again | ||||
| removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) | removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) | ||||
| removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) | removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) | ||||
| $ hg verify | $ hg verify | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| warning: revlog 'data/f2.d' not in fncache! | |||||
| checked 3 changesets with 3 changes to 3 files | checked 3 changesets with 3 changes to 3 files | ||||
| 1 warnings encountered! | |||||
| hint: run "hg debugrebuildfncache" to recover from corrupt fncache | |||||
| Check that we can select filelog only | Check that we can select filelog only | ||||
| $ hg debugupgrade --optimize re-delta-parent --run --no-changelog --no-manifest --no-backup --debug --traceback | $ hg debugupgrade --optimize re-delta-parent --run --no-changelog --no-manifest --no-backup --debug --traceback | ||||
| upgrade will perform the following actions: | upgrade will perform the following actions: | ||||
| requirements | requirements | ||||
| preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | ||||