This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9809

persistent-nodemap: catch the right exception on python
ClosedPublic

Authored by marmoute on Jan 17 2021, 2:29 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGd32e7ed81f4f: persistent-nodemap: catch the right exception on python
Summary

On Python 2, Missing file are IOError, not OSError, apparently.

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.Jan 17 2021, 2:29 PM
baymax updated this revision to Diff 25087.Jan 17 2021, 3:46 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

mharbison72 accepted this revision.Jan 17 2021, 5:05 PM
This revision is now accepted and ready to land.Jan 17 2021, 5:05 PM
marmoute added a commit: rHGd32e7ed81f4f: persistent-nodemap: catch the right exception on python.Jan 17 2021, 5:09 PM
Closed by commit rHGd32e7ed81f4f: persistent-nodemap: catch the right exception on python (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25091

mercurial/revlogutils/nodemap.py

filename = _rawdata_filepath(revlog, docket) filename = _rawdata_filepath(revlog, docket)
use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap")
try: try:
with revlog.opener(filename) as fd: with revlog.opener(filename) as fd:
if use_mmap: if use_mmap:
data = util.buffer(util.mmapread(fd, data_length)) data = util.buffer(util.mmapread(fd, data_length))
else: else:
data = fd.read(data_length) data = fd.read(data_length)
except OSError as e: except (IOError, OSError) as e:
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
return None return None
else: else:
raise raise
if len(data) < data_length: if len(data) < data_length:
return None return None
return docket, data return docket, data

tests/test-persistent-nodemap.t

tip-rev: 5002 tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088 data-length: 121088
data-unused: 0 data-unused: 0
data-unused: 0.000% data-unused: 0.000%
$ hg log -r "$OTHERNODE" -T '{rev}\n' $ hg log -r "$OTHERNODE" -T '{rev}\n'
5002 5002
missing data file
-----------------
$ UUID=`hg debugnodemap --metadata| grep 'uid:' | \
> sed 's/uid: //'`
$ FILE=.hg/store/00changelog-"${UUID}".nd
$ mv $FILE ../tmp-data-file
$ cp .hg/store/00changelog.n ../tmp-docket
mercurial don't crash
$ hg log -r .
changeset: 5002:b355ef8adce0
tag: tip
parent: 4998:d918ad6d18d3
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: babar
$ hg debugnodemap --metadata
$ hg debugupdatecache
$ hg debugnodemap --metadata
uid: * (glob)
tip-rev: 5002
tip-node: b355ef8adce0949b8bdf6afc72ca853740d65944
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ mv ../tmp-data-file $FILE
$ mv ../tmp-docket .hg/store/00changelog.n
Check transaction related property Check transaction related property
================================== ==================================
An up to date nodemap should be available to shell hooks, An up to date nodemap should be available to shell hooks,
$ echo dsljfl > a $ echo dsljfl > a
$ hg add a $ hg add a
$ hg ci -m a $ hg ci -m a