This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1140

localrepo: add a pinnedrevs attribute
ClosedPublic

Authored by pulkit on Oct 17 2017, 8:18 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc6552325b1ea: localrepo: add a pinnedrevs attribute
Summary

We have repoview.pinnedrevs() which take a repository object and returns the
hidden revisions which should not be filtered. To add more hidden revisions to
prevent them from getting obsoleted, we need to wrap the pinnedrevs function.

This patch adds repo.pinnedrevs which can be updated with the revisions which
needs to be prevented from being filtered. After this patch
repoview.pinnedrevs() updates repo.pinnedrevs and returns it.

The functionality to add commits to pinnedrevs without wrapping the function
will be very helpful is adding support for accessing hidden commits.

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.Oct 17 2017, 8:18 AM
dlax added a subscriber: dlax.Oct 17 2017, 3:09 PM
indygreg accepted this revision.Oct 18 2017, 12:11 PM
This revision is now accepted and ready to land.Oct 18 2017, 12:11 PM
Closed by commit rHGc6552325b1ea: localrepo: add a pinnedrevs attribute (authored by pulkit). · Explain WhyOct 18 2017, 12:22 PM
This revision was automatically updated to reflect the committed changes.
krbullock added a subscriber: krbullock.Oct 19 2017, 1:01 PM

We're dropping this stack from 4.4 because it caused unexpected behavior changes in python-hglib (https://buildbot.mercurial-scm.org/builders/python-hglib/builds/654) and elsewhere. Seems to stem from recomputing from the same set on repeated calls to repoview.pinnedrevs().

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)
Mmercurial/repoview.py (2 lines)

Diff 2990

mercurial/localrepo.py

self._postdsstatus = [] self._postdsstatus = []
# Cache of types representing filtered repos. # Cache of types representing filtered repos.
self._filteredrepotypes = weakref.WeakKeyDictionary() self._filteredrepotypes = weakref.WeakKeyDictionary()
# generic mapping between names and nodes # generic mapping between names and nodes
self.names = namespaces.namespaces() self.names = namespaces.namespaces()
# a set of hidden revisions which should not be filtered
self.pinnedrevs = set()
# Key to signature value. # Key to signature value.
self._sparsesignaturecache = {} self._sparsesignaturecache = {}
# Signature to cached matcher instance. # Signature to cached matcher instance.
self._sparsematchercache = {} self._sparsematchercache = {}
def _getvfsward(self, origfunc): def _getvfsward(self, origfunc):
"""build a ward for self.vfs""" """build a ward for self.vfs"""
rref = weakref.ref(self) rref = weakref.ref(self)

mercurial/repoview.py

lead to crashes.""" lead to crashes."""
return obsolete.getrevs(repo, 'obsolete') return obsolete.getrevs(repo, 'obsolete')
def pinnedrevs(repo): def pinnedrevs(repo):
"""revisions blocking hidden changesets from being filtered """revisions blocking hidden changesets from being filtered
""" """
cl = repo.changelog cl = repo.changelog
pinned = set() pinned = repo.pinnedrevs
pinned.update([par.rev() for par in repo[None].parents()]) pinned.update([par.rev() for par in repo[None].parents()])
pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()]) pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()])
tags = {} tags = {}
tagsmod.readlocaltags(repo.ui, repo, tags, {}) tagsmod.readlocaltags(repo.ui, repo, tags, {})
if tags: if tags:
rev, nodemap = cl.rev, cl.nodemap rev, nodemap = cl.rev, cl.nodemap
pinned.update(rev(t[0]) for t in tags.values() if t[0] in nodemap) pinned.update(rev(t[0]) for t in tags.values() if t[0] in nodemap)