upstream/mercurial-mirror Files · contrib/lock-checker.py

localrepo: omit ".hgsubstate" also from "added" files...

localrepo: omit ".hgsubstate" also from "added" files Before this patch, "localrepository.commit()" omits ".hgsubstate" from "modified" (changes[0]) and "removed" (changes[2]) file list before checking subrepositories, but leaves one in "added" (changes[1]) as it is. Then, "localrepository.commit()" adds ".hgsubstate" into "modified" or "removed" list forcibly, according to subrepository statuses. If "added" contains ".hgsubstate", the committed context will contain two ".hgsubstate" in its "files": one from "added" (not omitted one), and another from "modified" or "removed" (newly added one). How many times ".hgsubstate" appears in "files" changes node hash, even though revision content is same, because node hash calculation uses the specified "files" directly (without duplication check or so). This means that node hash of committed revision changes according to existence of ".hgsubstate" in "added" at "localrepository.commit()". ".hgsubstate" is treated as "added", not only in accidental cases, but also in the case of "qpush" for the patch adding ".hgsubstate". This patch omits ".hgsubstate" also from "added" files before checking subrepositories. This patch also omits ".hgsubstate" exclusion in "qnew"/"qrefresh" introduced by changeset d666da075b91, because this patch makes them meaningless. "hg parents --template '{files}\n'" newly added to "test-mq-subrepo.t" enhances checking unexpected multiple appearances of ".hgsubstate" in "files" of created/refreshed MQ revisions.

Mads Kiilerich - - Load All Authors

File last commit:

r20244:47d08436 default


                r20827:ca5dd216

default

Download file

             lock-checker.py
        
                    39 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / lock-checker.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				"""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