Mercurial > public > mercurial-scm > hg-stable
diff mercurial/bookmarks.py @ 42347:526750cdd02d
bookmarks: keep bookmarks in .hg/store if new config set
Bookmarks storage consists of two parts: (1) the set of bookmarks and
their positions, and (2) the current bookmark. The former can get
updated by exchange, while the latter cannot. However, they are both
stored in directly .hg/ and protected by repo.wlock(). As a result,
ugly workarounds were needed. This patch introduces a new config
option to store the set of bookmarks and their positions in .hg/store/
but still storing the current bookmark directory in .hg/. The config
option only takes effect at repo creation time. It results in a new
requirement being set.
Differential Revision: https://phab.mercurial-scm.org/D6387
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 15 May 2019 22:09:02 -0700 |
| parents | 2b77183ac477 |
| children | 08fce968d00b |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Thu May 16 08:15:20 2019 +0900 +++ b/mercurial/bookmarks.py Wed May 15 22:09:02 2019 -0700 @@ -33,6 +33,14 @@ # custom styles activebookmarklabel = 'bookmarks.active bookmarks.current' +BOOKMARKS_IN_STORE_REQUIREMENT = 'bookmarksinstore' + +def bookmarksinstore(repo): + return BOOKMARKS_IN_STORE_REQUIREMENT in repo.requirements + +def bookmarksvfs(repo): + return repo.svfs if bookmarksinstore(repo) else repo.vfs + def _getbkfile(repo): """Hook so that extensions that mess with the store can hook bm storage. @@ -40,7 +48,7 @@ bookmarks or the committed ones. Other extensions (like share) may need to tweak this behavior further. """ - fp, pending = txnutil.trypending(repo.root, repo.vfs, 'bookmarks') + fp, pending = txnutil.trypending(repo.root, bookmarksvfs(repo), 'bookmarks') return fp class bmstore(object): @@ -91,8 +99,11 @@ # ValueError: # - node in nm, for non-20-bytes entry # - split(...), for string without ' ' - repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n') - % pycompat.bytestr(line)) + bookmarkspath = '.hg/bookmarks' + if bookmarksinstore(repo): + bookmarkspath = '.hg/store/bookmarks' + repo.ui.warn(_('malformed line in %s: %r\n') + % (bookmarkspath, pycompat.bytestr(line))) except IOError as inst: if inst.errno != errno.ENOENT: raise @@ -192,8 +203,9 @@ """record that bookmarks have been changed in a transaction The transaction is then responsible for updating the file content.""" + location = '' if bookmarksinstore(self._repo) else 'plain' tr.addfilegenerator('bookmarks', ('bookmarks',), self._write, - location='plain') + location=location) tr.hookargs['bookmark_moved'] = '1' def _writerepo(self, repo): @@ -203,9 +215,14 @@ rbm.active = None rbm._writeactive() - with repo.wlock(): - with repo.vfs('bookmarks', 'w', atomictemp=True, - checkambig=True) as f: + if bookmarksinstore(repo): + vfs = repo.svfs + lock = repo.lock() + else: + vfs = repo.vfs + lock = repo.wlock() + with lock: + with vfs('bookmarks', 'w', atomictemp=True, checkambig=True) as f: self._write(f) def _writeactive(self): @@ -428,7 +445,11 @@ return d def pushbookmark(repo, key, old, new): - with repo.wlock(), repo.lock(), repo.transaction('bookmarks') as tr: + if bookmarksinstore(repo): + wlock = util.nullcontextmanager() + else: + wlock = repo.wlock() + with wlock, repo.lock(), repo.transaction('bookmarks') as tr: marks = repo._bookmarks existing = hex(marks.get(key, '')) if existing != old and existing != new: