This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5634

narrow: fix crash when restoring backup in legacy repo
ClosedPublic

Authored by martinvonz on Jan 19 2019, 2:51 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG88a7c211b21e: narrow: fix crash when restoring backup in legacy repo
Summary

Using --addremove when committing in an old repo (before we started
keeping .hg/narrowspec.dirstate) results in a crash. The test
case modified in this patch would crash like this:

abort: $ENOENT$

The issue is that when the dirstateguard is aborted, it tries to
restore the backup of .hg/narrowspec.dirstate. However, since we were
in an old repo, that file did not get created when the dirstateguard
was created. Note that the dirstateguard is not used unless
--addremove is passed.

This patch fixes the bug by making restorewcbackup() not fail if the
backup doesn't exist. I also made clearwcbackup() safe, just in 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

martinvonz created this revision.Jan 19 2019, 2:51 AM
martinvonz added a comment.Jan 19 2019, 2:53 AM

This is meant for the stable branch

Closed by commit rHG88a7c211b21e: narrow: fix crash when restoring backup in legacy repo (authored by martinvonz). · Explain WhyJan 19 2019, 6:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (6 lines)
Mtests/test-narrow-share.t (2 lines)

Diff 13328

mercurial/narrowspec.py

# It may not exist in old repos # It may not exist in old repos
if vfs.exists(DIRSTATE_FILENAME): if vfs.exists(DIRSTATE_FILENAME):
util.copyfile(vfs.join(DIRSTATE_FILENAME), vfs.join(backupname), util.copyfile(vfs.join(DIRSTATE_FILENAME), vfs.join(backupname),
hardlink=True) hardlink=True)
def restorewcbackup(repo, backupname): def restorewcbackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
# It may not exist in old repos
if repo.vfs.exists(backupname):
util.rename(repo.vfs.join(backupname), repo.vfs.join(DIRSTATE_FILENAME)) util.rename(repo.vfs.join(backupname), repo.vfs.join(DIRSTATE_FILENAME))
def clearwcbackup(repo, backupname): def clearwcbackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
repo.vfs.unlink(backupname) repo.vfs.tryunlink(backupname)
def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes): def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes):
r""" Restricts the patterns according to repo settings, r""" Restricts the patterns according to repo settings,
results in a logical AND operation results in a logical AND operation
:param req_includes: requested includes :param req_includes: requested includes
:param req_excludes: requested excludes :param req_excludes: requested excludes
:param repo_includes: repo includes :param repo_includes: repo includes

tests/test-narrow-share.t

$ hg add d3/g $ hg add d3/g
$ hg rm d7/f $ hg rm d7/f
$ hg st $ hg st
M d1/f M d1/f
A d3/g A d3/g
R d7/f R d7/f
Make it look like a repo from before narrow+share was supported Make it look like a repo from before narrow+share was supported
$ rm .hg/narrowspec.dirstate $ rm .hg/narrowspec.dirstate
$ hg st $ hg ci -Am test
abort: working copy's narrowspec is stale abort: working copy's narrowspec is stale
(run 'hg tracked --update-working-copy') (run 'hg tracked --update-working-copy')
[255] [255]
$ hg tracked --update-working-copy $ hg tracked --update-working-copy
$ hg st $ hg st
M d1/f M d1/f
A d3/g A d3/g
R d7/f R d7/f
$ cd .. $ cd ..