# HG changeset patch # User Vsevolod Solovyov # Date 2010-02-05 18:10:26 # Node ID d9a2bc2f776b3821f05b8b12f68f30e2b7c00b3f # Parent 6e721636fede17911a9290fab4a1055d0b8341bd add options dict to localrepo.store.opener and use it for defversion diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -89,6 +89,7 @@ class localrepository(repo.repository): self.sopener = self.store.opener self.sjoin = self.store.join self.opener.createmode = self.store.createmode + self.sopener.options = {} # These two define the set of tags for this repository. _tags # maps tag name to node; _tagtypes maps tag name to 'global' or @@ -112,7 +113,7 @@ class localrepository(repo.repository): p = os.environ['HG_PENDING'] if p.startswith(self.root): c.readpending('00changelog.i.a') - self.sopener.defversion = c.version + self.sopener.options['defversion'] = c.version return c @propertycache diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -431,8 +431,8 @@ class revlog(object): self.index = [] v = REVLOG_DEFAULT_VERSION - if hasattr(opener, "defversion"): - v = opener.defversion + if hasattr(opener, 'options') and 'defversion' in opener.options: + v = opener.options['defversion'] if v & REVLOGNG: v |= REVLOGNGINLINEDATA