Mercurial > hg
view contrib/lock-checker.py @ 18853:78d760aa3607
duplicatecopies: do not mark items not in the dirstate as copies
Consider the following repo:
0 -- 1 (renames a to b)
\
- 2
If we're rebasing 2 onto 1, then duplicatecopies is called with arguments (2,
1). copies.pathcopies goes backwards from 1 to 0 and returns the pair dst = a,
src = b. Of course, since we're working on top of 2, at this point a doesn't
exist in the dirstate.
Extra entries in the copymap are currently harmless because the copymap is
only queried for items in the dirstate map. However, if the dirstate.copy
method becomes one of the sources used to determine which files have changed,
this will prove problematic.
Note that we can't avoid going backwards in general -- consider this repo:
0 -- 1 (renames a to b)
\
- 2 (renames a to c)
Rebasing 2 onto 1 should produce a rename from b to c.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 28 Mar 2013 18:27:19 -0700 |
parents | b8424c92ba2b |
children | 47d0843647d1 |
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 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