##// END OF EJS Templates
merge: use separate lists for each action type...
merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

File last commit:

r20244:47d08436 default
r21545:43eecb4e default
Show More
lock-checker.py
39 lines | 1.3 KiB | text/x-python | PythonLexer
Augie Fackler
lock-checker: new contrib extension based on work done by Mads...
r17669 """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
Mads Kiilerich
util: introduce util.debugstacktrace for showing a stack trace without crashing...
r20244 from mercurial import util
Augie Fackler
lock-checker: new contrib extension based on work done by Mads...
r17669
def _checklock(repo):
l = repo._lockref and repo._lockref()
if l is None or not l.held:
Mads Kiilerich
util: introduce util.debugstacktrace for showing a stack trace without crashing...
r20244 util.debugstacktrace('missing lock', skip=1)
Augie Fackler
lock-checker: new contrib extension based on work done by Mads...
r17669
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
Mads Kiilerich
spelling: fix minor spell checker issues
r17738 # _writebranchcache and _writerequirements
Augie Fackler
lock-checker: new contrib extension based on work done by Mads...
r17669
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