Mercurial > hg
view contrib/lock-checker.py @ 21857:86c2d792a4b7
util: replace 'ellipsis' implementation by 'encoding.trim'
Before this patch, 'util.ellipsis' tried to avoid splitting at
intermediate multi-byte sequence, but its implementation was incorrect.
Internal function '_ellipsis' trims specified unicode sequence not at
most maxlength 'columns in display', but at most maxlength number of
'unicode characters'.
def _ellipsis(text, maxlength):
if len(text) <= maxlength:
return text, False
else:
return "%s..." % (text[:maxlength - 3]), True
In many encodings, number of unicode characters can be different from
columns in display.
This patch replaces 'ellipsis' implementation by 'encoding.trim',
which can trim string at most maxlength columns in display correctly,
even though specified string contains multi-byte characters.
'_ellipsis' is removed in this patch, because it is referred only from
'ellipsis'.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 06 Jul 2014 02:56:41 +0900 |
parents | 47d0843647d1 |
children |
line wrap: on
line source
"""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 from mercurial import util def _checklock(repo): l = repo._lockref and repo._lockref() if l is None or not l.held: util.debugstacktrace('missing lock', skip=1) 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