This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11866

dirstate-v2: fix upgrade on an empty repository
ClosedPublic

Authored by marmoute on Dec 7 2021, 3:51 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6e4999cb085e: dirstate-v2: fix upgrade on an empty repository
Summary

This used to crash as the dirstate file does not exist in this case.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 7 2021, 3:51 AM
marmoute updated this revision to Diff 31338.Dec 7 2021, 4:06 AM
Alphare accepted this revision.Dec 7 2021, 11:36 AM
This revision is now accepted and ready to land.Dec 7 2021, 11:36 AM
marmoute added a commit: rHG6e4999cb085e: dirstate-v2: fix upgrade on an empty repository.Dec 8 2021, 3:27 AM
Closed by commit rHG6e4999cb085e: dirstate-v2: fix upgrade on an empty repository (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31389

mercurial/upgrade_utils/engine.py

# upgrade.py - functions for in place upgrade of Mercurial repository # upgrade.py - functions for in place upgrade of Mercurial repository
# #
# Copyright (c) 2016-present, Gregory Szorc # Copyright (c) 2016-present, Gregory Szorc
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno
import stat import stat
from ..i18n import _ from ..i18n import _
from ..pycompat import getattr from ..pycompat import getattr
from .. import ( from .. import (
changelog, changelog,
error, error,
filelog, filelog,
backuppath = pycompat.mkdtemp( backuppath = pycompat.mkdtemp(
prefix=b'upgradebackup.', dir=srcrepo.path prefix=b'upgradebackup.', dir=srcrepo.path
) )
ui.status(_(b'replaced files will be backed up at %s\n') % backuppath) ui.status(_(b'replaced files will be backed up at %s\n') % backuppath)
backupvfs = vfsmod.vfs(backuppath) backupvfs = vfsmod.vfs(backuppath)
util.copyfile( util.copyfile(
srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires') srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires')
) )
try:
util.copyfile( util.copyfile(
srcrepo.vfs.join(b'dirstate'), backupvfs.join(b'dirstate') srcrepo.vfs.join(b'dirstate'), backupvfs.join(b'dirstate')
) )
except (IOError, OSError) as e:
# The dirstate does not exist on an empty repo or a repo with no
# revision checked out
if e.errno != errno.ENOENT:
raise
assert srcrepo.dirstate._use_dirstate_v2 == (old == b'v2') assert srcrepo.dirstate._use_dirstate_v2 == (old == b'v2')
srcrepo.dirstate._map.preload() srcrepo.dirstate._map.preload()
srcrepo.dirstate._use_dirstate_v2 = new == b'v2' srcrepo.dirstate._use_dirstate_v2 = new == b'v2'
srcrepo.dirstate._map._use_dirstate_v2 = srcrepo.dirstate._use_dirstate_v2 srcrepo.dirstate._map._use_dirstate_v2 = srcrepo.dirstate._use_dirstate_v2
srcrepo.dirstate._dirty = True srcrepo.dirstate._dirty = True
try:
srcrepo.vfs.unlink(b'dirstate') srcrepo.vfs.unlink(b'dirstate')
except (IOError, OSError) as e:
# The dirstate does not exist on an empty repo or a repo with no
# revision checked out
if e.errno != errno.ENOENT:
raise
srcrepo.dirstate.write(None) srcrepo.dirstate.write(None)
scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)

tests/test-upgrade-repo.t

creating temporary repository to stage upgraded data: $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob) creating temporary repository to stage upgraded data: $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (it is safe to interrupt this process any time before data migration completes)
downgrading from dirstate-v2 to v1 downgrading from dirstate-v2 to v1
replaced files will be backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
$ hg debugformat -v | grep dirstate-v2 $ hg debugformat -v | grep dirstate-v2
dirstate-v2: no no no dirstate-v2: no no no
$ hg status $ hg status
$ cd ..
dirstate-v2: upgrade and downgrade from and empty repository:
-------------------------------------------------------------
$ hg init --config format.exp-rc-dirstate-v2=no dirstate-v2-empty
$ cd dirstate-v2-empty
$ hg debugformat | grep dirstate-v2
dirstate-v2: no
upgrade
$ hg debugupgraderepo --run --config format.exp-rc-dirstate-v2=yes
upgrade will perform the following actions:
requirements
preserved: * (glob)
added: dirstate-v2
dirstate-v2
"hg status" will be faster
processed revlogs:
- all-filelogs
- changelog
- manifest
beginning upgrade...
repository locked and read-only
creating temporary repository to stage upgraded data: $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes)
upgrading to dirstate-v2 from v1
replaced files will be backed up at $TESTTMP/dirstate-v2-empty/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
$ hg debugformat | grep dirstate-v2
dirstate-v2: yes
downgrade
$ hg debugupgraderepo --run --config format.exp-rc-dirstate-v2=no
upgrade will perform the following actions:
requirements
preserved: * (glob)
removed: dirstate-v2
processed revlogs:
- all-filelogs
- changelog
- manifest
beginning upgrade...
repository locked and read-only
creating temporary repository to stage upgraded data: $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes)
downgrading from dirstate-v2 to v1
replaced files will be backed up at $TESTTMP/dirstate-v2-empty/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
$ hg debugformat | grep dirstate-v2
dirstate-v2: no
$ cd ..