##// END OF EJS Templates
subrepo: use relative path for "already tracked" message...
subrepo: use relative path for "already tracked" message From 932de135041f (subrepo: warn when adding already tracked files in gitsubrepo, 2015-02-27): The file is printed with abs() to be consistent with how it is printed in workingctx, even though that is inconsistent with how added files are printed in verbose mode. However, a few year later, the same author wrote 7008f6819002 (context: name files relative to cwd in warning messages, 2017-07-11) and now it's inconsistent. This fixes that inconsistency. Differential Revision: https://phab.mercurial-scm.org/D5899

File last commit:

r39333:06c976ac default
r41797:d8cdd532 default
Show More
repoview.py
271 lines | 10.4 KiB | text/x-python | PythonLexer
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 # repoview.py - Filtered view of a localrepo object
#
# Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Logilab SA <contact@logilab.fr>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
repoview: use absolute_import
r25972 from __future__ import absolute_import
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 import copy
Yuya Nishihara
repoview: extract a factory function of proxy class...
r35248 import weakref
Gregory Szorc
repoview: use absolute_import
r25972
from .node import nullrev
from . import (
obsolete,
phases,
Yuya Nishihara
repoview: include filter name in repr for debugging
r35249 pycompat,
Gregory Szorc
repoview: use absolute_import
r25972 tags as tagsmod,
)
Pierre-Yves David
clfilter: introduces a hidden filter...
r18242
Pierre-Yves David
repoview: extract hideable revision computation in a dedicated function...
r18293 def hideablerevs(repo):
Pierre-Yves David
hideablerevs: expand docstring to warn about possible traps...
r28780 """Revision candidates to be hidden
This is a standalone function to allow extensions to wrap it.
Pierre-Yves David
repoview: extract hideable revision computation in a dedicated function...
r18293
Pierre-Yves David
hideablerevs: expand docstring to warn about possible traps...
r28780 Because we use the set of immutable changesets as a fallback subset in
branchmap (see mercurial.branchmap.subsettable), you cannot set "public"
changesets as "hideable". Doing so would break multiple code assertions and
lead to crashes."""
Boris Feld
phases: add an internal phases...
r39333 obsoletes = obsolete.getrevs(repo, 'obsolete')
internals = repo._phasecache.getrevset(repo, phases.localhiddenphases)
internals = frozenset(internals)
return obsoletes | internals
Pierre-Yves David
repoview: extract hideable revision computation in a dedicated function...
r18293
Martin von Zweigbergk
hidden: rename "revealedrevs" to "pinnedrevs" (API)...
r32580 def pinnedrevs(repo):
Martin von Zweigbergk
hidden: drop obsolete comment about cacheability...
r32579 """revisions blocking hidden changesets from being filtered
hidden: drop outdated comment about "dynamic" performance...
r32479 """
repoview: move '_getdynamicblock' next to 'hideablerevs'...
r32426
cl = repo.changelog
Martin von Zweigbergk
hidden: rename "revealedrevs" to "pinnedrevs" (API)...
r32580 pinned = set()
pinned.update([par.rev() for par in repo[None].parents()])
pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()])
repoview: move '_getdynamicblock' next to 'hideablerevs'...
r32426
tags = {}
tagsmod.readlocaltags(repo.ui, repo, tags, {})
if tags:
rev, nodemap = cl.rev, cl.nodemap
Martin von Zweigbergk
hidden: rename "revealedrevs" to "pinnedrevs" (API)...
r32580 pinned.update(rev(t[0]) for t in tags.values() if t[0] in nodemap)
return pinned
repoview: move '_getdynamicblock' next to 'hideablerevs'...
r32426
hidden: simplify the computation of consistency blocker...
r32476
Martin von Zweigbergk
hidden: remove unnecessary 'domain' parameter from _revealancestors()...
r32582 def _revealancestors(pfunc, hidden, revs):
"""reveals contiguous chains of hidden ancestors of 'revs' by removing them
from 'hidden'
hidden: add a function returning ancestors of revs within a domain...
r32474
- pfunc(r): a funtion returning parent of 'r',
Martin von Zweigbergk
hidden: change _domainancestors() to _revealancestors()...
r32581 - hidden: the (preliminary) hidden revisions, to be updated
hidden: add a function returning ancestors of revs within a domain...
r32474 - revs: iterable of revnum,
Martin von Zweigbergk
hidden: make _revealancestors() reveal ancestors exclusively...
r32585 (Ancestors are revealed exclusively, i.e. the elements in 'revs' are
*not* revealed)
hidden: add a function returning ancestors of revs within a domain...
r32474 """
stack = list(revs)
while stack:
for p in pfunc(stack.pop()):
Martin von Zweigbergk
hidden: remove unnecessary 'domain' parameter from _revealancestors()...
r32582 if p != nullrev and p in hidden:
Martin von Zweigbergk
hidden: change _domainancestors() to _revealancestors()...
r32581 hidden.remove(p)
hidden: add a function returning ancestors of revs within a domain...
r32474 stack.append(p)
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 def computehidden(repo, visibilityexceptions=None):
Pierre-Yves David
clfilter: introduces a hidden filter...
r18242 """compute the set of hidden revision to filter
During most operation hidden should be filtered."""
assert not repo.changelog.filteredrevs
David Soria Parra
repoview: cache hidden changesets...
r22151
hidden: unify the static and dynamic blocker logic...
r32478 hidden = hideablerevs(repo)
if hidden:
Martin von Zweigbergk
hidden: subtract pinned revs from hidden earlier...
r32586 hidden = set(hidden - pinnedrevs(repo))
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 if visibilityexceptions:
hidden -= visibilityexceptions
hidden: unify the static and dynamic blocker logic...
r32478 pfunc = repo.changelog.parentrevs
Boris Feld
phases: define an official tuple of mutable phases...
r38174 mutable = repo._phasecache.getrevset(repo, phases.mutablephases)
hidden: unify the static and dynamic blocker logic...
r32478
Martin von Zweigbergk
hidden: remove unnecessary guard condition...
r32587 visible = mutable - hidden
_revealancestors(pfunc, hidden, visible)
hidden: unify the static and dynamic blocker logic...
r32478 return frozenset(hidden)
Pierre-Yves David
clfilter: introduces a hidden filter...
r18242
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 def computeunserved(repo, visibilityexceptions=None):
Pierre-Yves David
clfilter: introduce a "unserver" filtering mode...
r18102 """compute the set of revision that should be filtered when used a server
Secret and hidden changeset should not pretend to be here."""
assert not repo.changelog.filteredrevs
# fast path in simple case to avoid impact of non optimised code
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 hiddens = filterrevs(repo, 'visible')
Pierre-Yves David
performance: speedup computation of unserved revisions...
r18273 if phases.hassecret(repo):
Boris Feld
phases: define an official tuple of phases we do not share...
r38175 secrets = repo._phasecache.getrevset(repo, phases.remotehiddenphases)
return frozenset(hiddens | frozenset(secrets))
Pierre-Yves David
performance: speedup computation of unserved revisions...
r18273 else:
return hiddens
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 def computemutable(repo, visibilityexceptions=None):
Pierre-Yves David
clfilter: add mutable filtering...
r18245 assert not repo.changelog.filteredrevs
# fast check to avoid revset call on huge repo
Augie Fackler
cleanup: use __builtins__.any instead of util.any...
r25149 if any(repo._phasecache.phaseroots[1:]):
Pierre-Yves David
performance: speedup computation of mutable revisions...
r18274 getphase = repo._phasecache.phase
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 maymutable = filterrevs(repo, 'base')
Pierre-Yves David
performance: speedup computation of mutable revisions...
r18274 return frozenset(r for r in maymutable if getphase(repo, r))
Pierre-Yves David
clfilter: add mutable filtering...
r18245 return frozenset()
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 def computeimpactable(repo, visibilityexceptions=None):
Pierre-Yves David
clfilter: add impactable filter...
r18246 """Everything impactable by mutable revision
Pierre-Yves David
documentation: update to new filter names...
r18462 The immutable filter still have some chance to get invalidated. This will
Pierre-Yves David
clfilter: add impactable filter...
r18246 happen when:
- you garbage collect hidden changeset,
- public phase is moved backward,
- something is changed in the filtering (this could be fixed)
This filter out any mutable changeset and any public changeset that may be
impacted by something happening to a mutable revision.
This is achieved by filtered everything with a revision number egal or
higher than the first mutable changeset is filtered."""
assert not repo.changelog.filteredrevs
cl = repo.changelog
firstmutable = len(cl)
for roots in repo._phasecache.phaseroots[1:]:
if roots:
firstmutable = min(firstmutable, min(cl.rev(r) for r in roots))
Pierre-Yves David
repoview: protect `base` computation from weird phase root...
r18443 # protect from nullrev root
firstmutable = max(0, firstmutable)
Gregory Szorc
global: use pycompat.xrange()...
r38806 return frozenset(pycompat.xrange(firstmutable, len(cl)))
Pierre-Yves David
clfilter: add impactable filter...
r18246
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 # function to compute filtered set
Pierre-Yves David
filter: add a comment so that people do not forget to update subsettable...
r20196 #
Mads Kiilerich
comments: fix minor spelling issues found with spell checker
r20549 # When adding a new filter you MUST update the table at:
Pierre-Yves David
filter: add a comment so that people do not forget to update subsettable...
r20196 # mercurial.branchmap.subsettable
# Otherwise your filter will have to recompute all its branches cache
# from scratch (very slow).
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 filtertable = {'visible': computehidden,
Pulkit Goyal
repoview: add a new filtername for accessing hidden commits...
r35511 'visible-hidden': computehidden,
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 'served': computeunserved,
'immutable': computemutable,
'base': computeimpactable}
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 def filterrevs(repo, filtername, visibilityexceptions=None):
"""returns set of filtered revision for this filter name
visibilityexceptions is a set of revs which must are exceptions for
hidden-state and must be visible. They are dynamic and hence we should not
cache it's result"""
Pierre-Yves David
clfilter: add a cache on repo for set of revision to filter for a given set....
r18101 if filtername not in repo.filteredrevcache:
func = filtertable[filtername]
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 if visibilityexceptions:
return func(repo.unfiltered, visibilityexceptions)
Pierre-Yves David
clfilter: add a cache on repo for set of revision to filter for a given set....
r18101 repo.filteredrevcache[filtername] = func(repo.unfiltered())
return repo.filteredrevcache[filtername]
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100
class repoview(object):
"""Provide a read/write view of a repo through a filtered changelog
This object is used to access a filtered version of a repository without
altering the original repository object itself. We can not alter the
original object for two main reasons:
- It prevents the use of a repo with multiple filters at the same time. In
particular when multiple threads are involved.
- It makes scope of the filtering harder to control.
This object behaves very closely to the original repository. All attribute
operations are done on the original repository:
- An access to `repoview.someattr` actually returns `repo.someattr`,
- A write to `repoview.someattr` actually sets value of `repo.someattr`,
- A deletion of `repoview.someattr` actually drops `someattr`
from `repo.__dict__`.
The only exception is the `changelog` property. It is overridden to return
a (surface) copy of `repo.changelog` with some revisions filtered. The
`filtername` attribute of the view control the revisions that need to be
filtered. (the fact the changelog is copied is an implementation detail).
Unlike attributes, this object intercepts all method calls. This means that
all methods are run on the `repoview` object with the filtered `changelog`
property. For this purpose the simple `repoview` class must be mixed with
the actual class of the repository. This ensures that the resulting
`repoview` object have the very same methods than the repo object. This
leads to the property below.
repoview.method() --> repo.__class__.method(repoview)
The inheritance has to be done dynamically because `repo` can be of any
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 subclasses of `localrepo`. Eg: `bundlerepo` or `statichttprepo`.
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 """
Pulkit Goyal
repoview: add visibilityexceptions as an optional argument to repo.filtered()...
r35508 def __init__(self, repo, filtername, visibilityexceptions=None):
Pulkit Goyal
repoview: convert attribute names to unicodes on Python 3...
r31221 object.__setattr__(self, r'_unfilteredrepo', repo)
object.__setattr__(self, r'filtername', filtername)
object.__setattr__(self, r'_clcachekey', None)
object.__setattr__(self, r'_clcache', None)
Pulkit Goyal
repoview: add visibilityexceptions as an optional argument to repo.filtered()...
r35508 # revs which are exceptions and must not be hidden
object.__setattr__(self, r'_visibilityexceptions',
visibilityexceptions)
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 # not a propertycache on purpose we shall implement a proper cache later
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 @property
def changelog(self):
"""return a filtered version of the changeset
this changelog must not be used for writing"""
# some cache may be implemented later
Pierre-Yves David
repoview: cache filtered changelog...
r18445 unfi = self._unfilteredrepo
unfichangelog = unfi.changelog
Pierre-Yves David
repoview: bypass changelog method to computed cache key...
r27258 # bypass call to changelog.method
unfiindex = unfichangelog.index
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 unfilen = len(unfiindex)
Pierre-Yves David
repoview: bypass changelog method to computed cache key...
r27258 unfinode = unfiindex[unfilen - 1][7]
Pulkit Goyal
repoview: add visibilityexception argument to filterrevs() and related fns...
r35509 revs = filterrevs(unfi, self.filtername, self._visibilityexceptions)
Pierre-Yves David
repoview: cache filtered changelog...
r18445 cl = self._clcache
Pierre-Yves David
repoview: bypass changelog method to computed cache key...
r27258 newkey = (unfilen, unfinode, hash(revs), unfichangelog._delayed)
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 # if cl.index is not unfiindex, unfi.changelog would be
# recreated, and our clcache refers to garbage object
if (cl is not None and
(cl.index is not unfiindex or newkey != self._clcachekey)):
Pierre-Yves David
repoview: bypass changelog method to computed cache key...
r27258 cl = None
Pierre-Yves David
repoview: cache filtered changelog...
r18445 # could have been made None by the previous if
if cl is None:
cl = copy.copy(unfichangelog)
cl.filteredrevs = revs
Augie Fackler
repoview: specify setattr values as native strings
r31358 object.__setattr__(self, r'_clcache', cl)
object.__setattr__(self, r'_clcachekey', newkey)
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 return cl
def unfiltered(self):
"""Return an unfiltered version of a repo"""
return self._unfilteredrepo
Pulkit Goyal
repoview: add visibilityexceptions as an optional argument to repo.filtered()...
r35508 def filtered(self, name, visibilityexceptions=None):
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 """Return a filtered version of a repository"""
Pulkit Goyal
repoview: add visibilityexceptions as an optional argument to repo.filtered()...
r35508 if name == self.filtername and not visibilityexceptions:
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 return self
Pulkit Goyal
repoview: add visibilityexceptions as an optional argument to repo.filtered()...
r35508 return self.unfiltered().filtered(name, visibilityexceptions)
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100
Yuya Nishihara
repoview: include filter name in repr for debugging
r35249 def __repr__(self):
return r'<%s:%s %r>' % (self.__class__.__name__,
pycompat.sysstr(self.filtername),
self.unfiltered())
Pierre-Yves David
clfilter: add actual repo filtering mechanism...
r18100 # everything access are forwarded to the proxied repo
def __getattr__(self, attr):
return getattr(self._unfilteredrepo, attr)
def __setattr__(self, attr, value):
return setattr(self._unfilteredrepo, attr, value)
def __delattr__(self, attr):
return delattr(self._unfilteredrepo, attr)
Yuya Nishihara
repoview: extract a factory function of proxy class...
r35248
# Python <3.4 easily leaks types via __mro__. See
# https://bugs.python.org/issue17950. We cache dynamically created types
# so they won't be leaked on every invocation of repo.filtered().
_filteredrepotypes = weakref.WeakKeyDictionary()
def newtype(base):
"""Create a new type with the repoview mixin and the given base class"""
if base not in _filteredrepotypes:
class filteredrepo(repoview, base):
pass
_filteredrepotypes[base] = filteredrepo
return _filteredrepotypes[base]