This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1011

localrepo: add a _pinnedrevs attribute
AbandonedPublic

Authored by pulkit on Oct 11 2017, 3:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
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
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 11 2017, 3:10 PM
dlax added a subscriber: dlax.Oct 12 2017, 3:02 AM
dlax added inline comments.
mercurial/repoview.py
38

Updating a "private" attribute of an object outside the class is not nice.
Not sure about "our" common practice in this case, but maybe this could be handled through a property?

pulkit added inline comments.Oct 12 2017, 1:28 PM
mercurial/repoview.py
38

Hm, I will turn that attribute to public in next version.

pulkit abandoned this revision.Oct 17 2017, 8:22 AM

Resend the series as D1140 - D1144.

Revision Contents
Changeset List

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

Diff 2593

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()])
dlaxUnsubmitted
Not Done

Updating a "private" attribute of an object outside the class is not nice.
Not sure about "our" common practice in this case, but maybe this could be handled through a property?

dlax: Updating a "private" attribute of an object outside the class is not nice. Not sure about "our"…
pulkitAuthorUnsubmitted
Not Done

Hm, I will turn that attribute to public in next version.

pulkit: Hm, I will turn that attribute to public in next version.
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)
return pinned return pinned