Patchwork D6469: bookmarks: use correct store for "ambiguity check"

login
register
mail settings
Submitter phabricator
Date June 5, 2019, 7:05 p.m.
Message ID <5225871b679d521d84026b840cd3dce1@localhost.localdomain>
Download mbox | patch
Permalink /patch/40327/
State Not Applicable
Headers show

Comments

phabricator - June 5, 2019, 7:05 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd532292eff22: bookmarks: use correct store for &quot;ambiguity check&quot; (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6469?vs=15317&id=15347

REVISION DETAIL
  https://phab.mercurial-scm.org/D6469

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, marmoute, pulkit
Cc: marmoute, mercurial-devel

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -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)
@@ -1219,8 +1219,8 @@ 
         cls = repoview.newtype(self.unfiltered().__class__)
         return cls(self, name, visibilityexceptions)
 
-    @mixedrepostorecache(('bookmarks', ''), ('bookmarks.current', ''),
-                         ('00changelog.i', 'store'))
+    @mixedrepostorecache(('bookmarks', 'plain'), ('bookmarks.current', 'plain'),
+                         ('00changelog.i', ''))
     def _bookmarks(self):
         return bookmarks.bmstore(self)