This is an archive of the discontinued Mercurial Phabricator instance.

Differential D150

hiddenoverride: in memory/disc out of sync fix
ClosedPublic

Authored by felixmerk on Jul 19 2017, 5:31 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX494360d6e3ef: hiddenoverride: in memory/disc out of sync fix
Summary

Before, out of syncness of in memory state and on disc state caused certain
commands to (appear to) perform repo changes after they had returned. This
broke hg undo. This change fixes this by using the in memory state.

Diff Detail

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

Event Timeline

felixmerk created this revision.Jul 19 2017, 5:31 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 19 2017, 5:31 PM
quark accepted this revision.Jul 19 2017, 6:59 PM
This revision is now accepted and ready to land.Jul 19 2017, 6:59 PM
Closed by commit rFBHGX494360d6e3ef: hiddenoverride: in memory/disc out of sync fix (authored by felixmerk). · Explain WhyJul 19 2017, 10:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 313

hgext3rd/fbamend/hiddenoverride.py

def uisetup(ui): def uisetup(ui):
extensions.wrapfunction(repoview, 'pinnedrevs', pinnedrevs) extensions.wrapfunction(repoview, 'pinnedrevs', pinnedrevs)
extensions.wrapfunction(dispatch, 'runcommand', runcommand) extensions.wrapfunction(dispatch, 'runcommand', runcommand)
extensions.wrapfunction(obsolete, 'createmarkers', createmarkers) extensions.wrapfunction(obsolete, 'createmarkers', createmarkers)
def pinnedrevs(orig, repo): def pinnedrevs(orig, repo):
revs = orig(repo) revs = orig(repo)
nodemap = repo.changelog.nodemap nodemap = repo.changelog.nodemap
pinned = list(nodemap[n] for n in loadpinnednodes(repo) if n in nodemap) pinnednodes = set(loadpinnednodes(repo))
revs.update(pinned) tounpin = getattr(repo, '_tounpinnodes', set())
pinnednodes -= tounpin
revs.update(nodemap[n] for n in pinnednodes)
return revs return revs
def loadpinnednodes(repo): def loadpinnednodes(repo):
"""yield pinned nodes that should be visible""" """yield pinned nodes that should be visible"""
if repo is None or not repo.local(): if repo is None or not repo.local():
return return
# the "pinned nodes" file name is "obsinhibit" for compatibility reason # the "pinned nodes" file name is "obsinhibit" for compatibility reason
content = repo.svfs.tryread('obsinhibit') or '' content = repo.svfs.tryread('obsinhibit') or ''