Mercurial > hg

changeset 42422:381d8fa53f34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Jun 2019 14:29:44 -0700
parents c77ab654415b (current diff) d532292eff22 (diff)
children 0ae593e791fb
files mercurial/localrepo.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Jun 05 10:18:00 2019 -0400
+++ b/mercurial/localrepo.py	Wed Jun 05 14:29:44 2019 -0700
@@ -133,10 +133,10 @@
 
     def join(self, obj, fnameandlocation):
         fname, location = fnameandlocation
-        if location == '':
+        if location == 'plain':
             return obj.vfs.join(fname)
         else:
-            if location != 'store':
+            if location != '':
                 raise error.ProgrammingError('unexpected location: %s' %
                                              location)
             return obj.sjoin(fname)
@@ -1225,8 +1225,8 @@
         cls = repoview.newtype(self.unfiltered().__class__)
         return cls(self, name, visibilityexceptions)
 
-    @mixedrepostorecache(('bookmarks', ''), ('bookmarks.current', ''),
-                         ('bookmarks', 'store'), ('00changelog.i', 'store'))
+    @mixedrepostorecache(('bookmarks', 'plain'), ('bookmarks.current', 'plain'),
+                         ('bookmarks', ''), ('00changelog.i', ''))
     def _bookmarks(self):
         return bookmarks.bmstore(self)