D6469: bookmarks: use correct store for "ambiguity check"
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jun 5 15:05:45 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd532292eff22: bookmarks: use correct store for "ambiguity check" (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
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)
To: martinvonz, #hg-reviewers, marmoute, pulkit
Cc: marmoute, mercurial-devel
More information about the Mercurial-devel
mailing list