This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4281

branchmap: load branchmap as an iterable
ClosedPublic

Authored by mjpieters on Aug 13 2018, 4:26 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2a4bfbb52111: branchmap: load branchmap as an iterable
rHG9a800691f075: branchmap: load branchmap as an iterable
Summary

This avoids reading all the file into memory if the cache turns out to be
invalid.

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

mjpieters created this revision.Aug 13 2018, 4:26 PM
durin42 accepted this revision.Aug 15 2018, 11:07 PM
This revision is now accepted and ready to land.Aug 15 2018, 11:07 PM
Closed by commit rHG9a800691f075: branchmap: load branchmap as an iterable (authored by mjpieters). · Explain WhyAug 15 2018, 11:08 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Aug 16 2018, 6:36 AM

def read(repo):

try:
    f = repo.cachevfs(_filename(repo))
  • lines = f.read().split('\n')
  • f.close()
  • except (IOError, OSError):
  • return None -
  • try:
  • cachekey = lines.pop(0).split(" ", 2)

+ cachekey = next(f).split(" ", 2)

Several tests fail, probably because of missed rstrip().

partial.setdefault(label, []).append(node)
if state == 'c':
    partial._closednodes.add(node)

+
+ except (IOError, OSError):
+ return None
+

except Exception as inst:
    if repo.ui.debugflag:
        msg = 'invalid branchheads cache'

Missed finally: f.close()?

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (14 lines)

Diff 10374

mercurial/branchmap.py

filename = "branch2" filename = "branch2"
if repo.filtername: if repo.filtername:
filename = '%s-%s' % (filename, repo.filtername) filename = '%s-%s' % (filename, repo.filtername)
return filename return filename
def read(repo): def read(repo):
try: try:
f = repo.cachevfs(_filename(repo)) f = repo.cachevfs(_filename(repo))
lines = f.read().split('\n') cachekey = next(f).split(" ", 2)
f.close()
except (IOError, OSError):
return None
try:
cachekey = lines.pop(0).split(" ", 2)
last, lrev = cachekey[:2] last, lrev = cachekey[:2]
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])
partial = branchcache(tipnode=last, tiprev=lrev, partial = branchcache(tipnode=last, tiprev=lrev,
filteredhash=filteredhash) filteredhash=filteredhash)
if not partial.validfor(repo): if not partial.validfor(repo):
# invalidate the cache # invalidate the cache
raise ValueError(r'tip differs') raise ValueError(r'tip differs')
cl = repo.changelog cl = repo.changelog
for l in lines: for l in f:
if not l: if not l:
continue continue
node, state, label = l.split(" ", 2) node, state, label = l.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())
node = bin(node) node = bin(node)
if not cl.hasnode(node): if not cl.hasnode(node):
raise ValueError( raise ValueError(
r'node %s does not exist' % pycompat.sysstr(hex(node))) r'node %s does not exist' % pycompat.sysstr(hex(node)))
partial.setdefault(label, []).append(node) partial.setdefault(label, []).append(node)
if state == 'c': if state == 'c':
partial._closednodes.add(node) partial._closednodes.add(node)
except (IOError, OSError):
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))
partial = None partial = None