From patchwork Fri Sep 27 20:23:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D6905: upgrade: also register copied `.d` files to fncache From: phabricator X-Patchwork-Id: 41818 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Fri, 27 Sep 2019 20:23:10 +0000 marmoute created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6905 AFFECTED FILES mercurial/upgrade.py tests/test-upgrade-repo.t CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mjpieters, mercurial-devel diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t --- a/tests/test-upgrade-repo.t +++ b/tests/test-upgrade-repo.t @@ -604,10 +604,7 @@ checking manifests crosschecking files in changesets and manifests checking files - warning: revlog 'data/f2.d' not in fncache! 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 @@ -699,10 +696,7 @@ checking manifests crosschecking files in changesets and manifests checking files - warning: revlog 'data/f2.d' not in fncache! 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 diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -561,12 +561,15 @@ pass # create all the directories util.copyfile(oldindex, newindex) - if oldrl.opener.exists(oldrl.datafile): + copydata = oldrl.opener.exists(oldrl.datafile) + if copydata: util.copyfile(olddata, newdata) if not (unencodedname.endswith('00changelog.i') or unencodedname.endswith('00manifest.i')): destrepo.svfs.fncache.add(unencodedname) + if copydata: + destrepo.svfs.fncache.add(unencodedname[:-2] + '.d') UPGRADE_CHANGELOG = object() UPGRADE_MANIFEST = object()