##// END OF EJS Templates
bookmarks: pull --update updates to active bookmark if it moved (issue4007)...
bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

File last commit:

r17738:b8424c92 default
r19523:f37b5a17 2.7 stable
Show More
lock-checker.py
48 lines | 1.6 KiB | text/x-python | PythonLexer
"""Extension to verify locks are obtained in the required places.
This works by wrapping functions that should be surrounded by a lock
and asserting the lock is held. Missing locks are called out with a
traceback printed to stderr.
This currently only checks store locks, not working copy locks.
"""
import os
import traceback
def _warnstack(ui, msg, skip=1):
'''issue warning with the message and the current stack, skipping the
skip last entries'''
ui.warn('%s at:\n' % msg)
entries = traceback.extract_stack()[:-skip]
fnmax = max(len(entry[0]) for entry in entries)
for fn, ln, func, _text in entries:
ui.warn(' %*s:%-4s in %s\n' % (fnmax, fn, ln, func))
def _checklock(repo):
l = repo._lockref and repo._lockref()
if l is None or not l.held:
_warnstack(repo.ui, 'missing lock', skip=2)
def reposetup(ui, repo):
orig = repo.__class__
class lockcheckrepo(repo.__class__):
def _writejournal(self, *args, **kwargs):
_checklock(self)
return orig._writejournal(self, *args, **kwargs)
def transaction(self, *args, **kwargs):
_checklock(self)
return orig.transaction(self, *args, **kwargs)
# TODO(durin42): kiilerix had a commented-out lock check in
# _writebranchcache and _writerequirements
def _tag(self, *args, **kwargs):
_checklock(self)
return orig._tag(self, *args, **kwargs)
def write(self, *args, **kwargs):
assert os.path.lexists(self._join('.hg/wlock'))
return orig.write(self, *args, **kwargs)
repo.__class__ = lockcheckrepo