Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 19852:57479e0d203d
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Oct 2013 17:00:03 -0700 |
parents | 55ef79031009 9789670992d6 |
children | eddc2a2d57e6 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Oct 01 10:44:59 2013 -0700 +++ b/mercurial/localrepo.py Tue Oct 01 17:00:03 2013 -0700 @@ -39,9 +39,10 @@ """propertycache that apply to unfiltered repo only""" def __get__(self, repo, type=None): - if hasunfilteredcache(repo, self.name): - return getattr(repo.unfiltered(), self.name) - return super(unfilteredpropertycache, self).__get__(repo.unfiltered()) + unfi = repo.unfiltered() + if unfi is repo: + return super(unfilteredpropertycache, self).__get__(unfi) + return getattr(unfi, self.name) class filteredpropertycache(propertycache): """propertycache that must take filtering in account"""