This is an archive of the discontinued Mercurial Phabricator instance.

Differential D806

hiddenoverride: do not resolve obsoleted revisions during startup
ClosedPublic

Authored by quark on Sep 23 2017, 5:51 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX74ec98d48632: hiddenoverride: do not resolve obsoleted revisions during startup
Summary

Resolving obsoleted revisions (repo.revs('obsolete()')) is slow. Let's
move that filtering logic from read code path to write code path. So it does
not get executed for every command.

Test Plan

hg bookmark --hidden --profile. Make sure obsstore loading logic
disappears from the profiling output.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 23 2017, 5:51 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 23 2017, 5:51 PM
quark updated this revision to Diff 2056.Sep 23 2017, 8:28 PM
durham accepted this revision.Sep 26 2017, 7:48 AM
This revision is now accepted and ready to land.Sep 26 2017, 7:48 AM
Closed by commit rFBHGX74ec98d48632: hiddenoverride: do not resolve obsoleted revisions during startup (authored by quark). · Explain WhySep 26 2017, 5:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/hiddenoverride.py (10 lines)

Diff 2053

hgext3rd/fbamend/hiddenoverride.py

unfi = repo.unfiltered() unfi = repo.unfiltered()
nodemap = unfi.changelog.nodemap nodemap = unfi.changelog.nodemap
offset = 0 offset = 0
result = [] result = []
while True: while True:
node = content[offset:offset + 20] node = content[offset:offset + 20]
if not node: if not node:
break break
# remove unnecessary (non-obsoleted) nodes since pinnedrevs should only if node in nodemap:
# affect obsoleted revs.
if node in nodemap and unfi[node].obsolete():
result.append(node) result.append(node)
offset += 20 offset += 20
return result return result
def shouldpinnodes(repo): def shouldpinnodes(repo):
"""get nodes that should be pinned: working parent + bookmarks for now""" """get nodes that should be pinned: working parent + bookmarks for now"""
result = set() result = set()
if repo and repo.local(): if repo and repo.local():
# working copy parent # working copy parent
try: try:
wnode = repo.vfs('dirstate').read(20) wnode = repo.vfs('dirstate').read(20)
result.add(wnode) result.add(wnode)
except Exception: except Exception:
pass pass
# bookmarks # bookmarks
result.update(repo._bookmarks.values()) result.update(repo.unfiltered()._bookmarks.values())
return result return result
@contextlib.contextmanager @contextlib.contextmanager
def flock(lockpath): def flock(lockpath):
# best effort lightweight lock # best effort lightweight lock
try: try:
import fcntl import fcntl
fcntl.flock fcntl.flock
def savepinnednodes(repo, newpin, newunpin, fullargs): def savepinnednodes(repo, newpin, newunpin, fullargs):
# take a narrowed lock so it does not affect repo lock # take a narrowed lock so it does not affect repo lock
with flock(repo.svfs.join('obsinhibit.lock')): with flock(repo.svfs.join('obsinhibit.lock')):
orignodes = loadpinnednodes(repo) orignodes = loadpinnednodes(repo)
nodes = set(orignodes) nodes = set(orignodes)
nodes |= set(newpin) nodes |= set(newpin)
nodes -= set(newunpin) nodes -= set(newunpin)
# remove unnecessary (non-obsoleted) nodes since pinnedrevs should only
# affect obsoleted revs.
obsoleted = repo.unfiltered().revs('obsolete()')
nodes = [n for n in nodes if n not in obsoleted]
with util.atomictempfile(repo.svfs.join('obsinhibit')) as f: with util.atomictempfile(repo.svfs.join('obsinhibit')) as f:
f.write(''.join(nodes)) f.write(''.join(nodes))
desc = lambda s: [short(n) for n in s] desc = lambda s: [short(n) for n in s]
repo.ui.log('pinnednodes', 'pinnednodes: %r newpin=%r newunpin=%r ' repo.ui.log('pinnednodes', 'pinnednodes: %r newpin=%r newunpin=%r '
'before=%r after=%r\n', fullargs, desc(newpin), 'before=%r after=%r\n', fullargs, desc(newpin),
desc(newunpin), desc(orignodes), desc(nodes)) desc(newunpin), desc(orignodes), desc(nodes))