( )⚙ D6028 branchmap: prevent reading the file twice through different iterators

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6028

branchmap: prevent reading the file twice through different iterators
ClosedPublic

Authored by pulkit on Feb 26 2019, 9:26 AM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG8ad46ac6728e: branchmap: prevent reading the file twice through different iterators
Summary

Otherwise, test-static-http.t breaks.

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

pulkit created this revision.Feb 26 2019, 9:26 AM
lothiraldan added subscribers: yuja, lothiraldan.Feb 27 2019, 4:52 AM
lothiraldan accepted this revision.

Queued thanks, the test now pass both locally and on gcc112. @yuja nice catch!

Closed by commit rHG8ad46ac6728e: branchmap: prevent reading the file twice through different iterators (authored by pulkit). · Explain WhyFeb 27 2019, 4:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (8 lines)

Diff 14251

mercurial/branchmap.py

last, lrev = bin(last), int(lrev) last, lrev = bin(last), int(lrev)
filteredhash = None filteredhash = None
if len(cachekey) > 2: if len(cachekey) > 2:
filteredhash = bin(cachekey[2]) filteredhash = bin(cachekey[2])
bcache = cls(tipnode=last, tiprev=lrev, filteredhash=filteredhash) bcache = cls(tipnode=last, tiprev=lrev, filteredhash=filteredhash)
if not bcache.validfor(repo): if not bcache.validfor(repo):
# invalidate the cache # invalidate the cache
raise ValueError(r'tip differs') raise ValueError(r'tip differs')
bcache.load(repo, f) bcache.load(repo, lineiter)
except (IOError, OSError): except (IOError, OSError):
return None return None
except Exception as inst: except Exception as inst:
if repo.ui.debugflag: if repo.ui.debugflag:
msg = 'invalid branchheads cache' msg = 'invalid branchheads cache'
if repo.filtername is not None: if repo.filtername is not None:
msg += ' (%s)' % repo.filtername msg += ' (%s)' % repo.filtername
msg += ': %s\n' msg += ': %s\n'
repo.ui.debug(msg % pycompat.bytestr(inst)) repo.ui.debug(msg % pycompat.bytestr(inst))
bcache = None bcache = None
finally: finally:
if f: if f:
f.close() f.close()
return bcache return bcache
def load(self, repo, f): def load(self, repo, lineiter):
""" fully loads the branchcache by reading from the file f """ """ fully loads the branchcache by reading from the file using the line
iterator passed"""
cl = repo.changelog cl = repo.changelog
lineiter = iter(f)
for line in lineiter: for line in lineiter:
line = line.rstrip('\n') line = line.rstrip('\n')
if not line: if not line:
continue continue
node, state, label = line.split(" ", 2) node, state, label = line.split(" ", 2)
if state not in 'oc': if state not in 'oc':
raise ValueError(r'invalid branch state') raise ValueError(r'invalid branch state')
label = encoding.tolocal(label.strip()) label = encoding.tolocal(label.strip())