upstream/mercurial-mirror Files · contrib/dirstatenonnormalcheck.py

rebase: turn rebase revs into set before filtering obsolete...

rebase: turn rebase revs into set before filtering obsolete When the inhibit extension from mutable-history is enabled, it attempts to iterate over the rebaseset to prevent the nodes being rebased from being marked obsolete. This happens at the same time as rebase's _filterobsoleterevs function trying to iterate over the rebaseset to figure out which ones are obsolete. The two of these iterating over the same revset generatorset cause a 'generator already executing' exception. This is probably a flaw in the revset implementation, since iterating over the same set twice should be supported. This regression was introduced in 5d16ebe7b14, since it changed _filterobsoleterevs to be called before the rebaseset was turned into a set(). For now let’s just make the rebaseset an actual set again before calling that function. This was caught by the inhibit tests. The relevant call stack from test-inhibit.t: File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 285, in _preparenewrebase obsrevs = _filterobsoleterevs(self.repo, rebaseset) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 197, in _filterobsoleterevswrap r = orig(repo, rebasesetrevs, *args, **kwargs) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in _filterobsoleterevs return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in <genexpr> return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3079, in _iterordered val2 = next(iter2) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3417, in gen yield nextrev() File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 71, in iterate cl = repo.changelog File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 319, in changelog revs = filterrevs(unfi, self.filtername) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/directaccess.py", line 65, in _computehidden hidden = repoview.filterrevs(repo, 'visible') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 175, in computehidden hideable = hideablerevs(repo) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 33, in hideablerevs return obsolete.getrevs(repo, 'obsolete') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/obsolete.py", line 1097, in getrevs repo.obsstore.caches[name] = cachefuncs[name](repo) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 255, in _computeobsoleteset if getrev(n) not in blacklist: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3264, in __contains__ return x in self._r1 or x in self._r2 File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3348, in __contains__ for l in self._consumegen(): File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: ValueError: generator already executing

Pierre-Yves David - - Load All Authors

File last commit:

r29100:3fd94f60 default


                r29610:754f6367

stable

Download file

             dirstatenonnormalcheck.py
        
                    57 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / dirstatenonnormalcheck.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # dirstatenonnormalcheck.py - extension to check the consistency of the

      # dirstate's non-normal map

      #

      # For most operations on dirstate, this extensions checks that the nonnormalset

      # contains the right entries.

      # It compares the nonnormal file to a nonnormalset built from the map of all

      # the files in the dirstate to check that they contain the same files.

      from __future__ import absolute_import

      from mercurial import (

          dirstate,

          extensions,

      )

      def nonnormalentries(dmap):

          """Compute nonnormal entries from dirstate's dmap"""

          res = set()

          for f, e in dmap.iteritems():

              if e[0] != 'n' or e[3] == -1:

                  res.add(f)

          return res

      def checkconsistency(ui, orig, dmap, _nonnormalset, label):

          """Compute nonnormalset from dmap, check that it matches _nonnormalset"""

          nonnormalcomputedmap = nonnormalentries(dmap)

          if _nonnormalset != nonnormalcomputedmap:

              ui.develwarn("%s call to %s\n" % (label, orig), config='dirstate')

              ui.develwarn("inconsistency in nonnormalset\n", config='dirstate')

              ui.develwarn("[nonnormalset] %s\n" % _nonnormalset, config='dirstate')

              ui.develwarn("[map] %s\n" % nonnormalcomputedmap, config='dirstate')

      def _checkdirstate(orig, self, arg):

          """Check nonnormal set consistency before and after the call to orig"""

          checkconsistency(self._ui, orig, self._map, self._nonnormalset, "before")

          r = orig(self, arg)

          checkconsistency(self._ui, orig, self._map, self._nonnormalset, "after")

          return r

      def extsetup(ui):

          """Wrap functions modifying dirstate to check nonnormalset consistency"""

          dirstatecl = dirstate.dirstate

          devel = ui.configbool('devel', 'all-warnings')

          paranoid = ui.configbool('experimental', 'nonnormalparanoidcheck')

          if devel:

              extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate)

              if paranoid:

                  # We don't do all these checks when paranoid is disable as it would

                  # make the extension run very slowly on large repos

                  extensions.wrapfunction(dirstatecl, 'normallookup', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)

                  extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)

	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

				# dirstatenonnormalcheck.py - extension to check the consistency of the
				# dirstate's non-normal map
				#
				# For most operations on dirstate, this extensions checks that the nonnormalset
				# contains the right entries.
				# It compares the nonnormal file to a nonnormalset built from the map of all
				# the files in the dirstate to check that they contain the same files.

				from __future__ import absolute_import

				from mercurial import (
				dirstate,
				extensions,
				)

				def nonnormalentries(dmap):
				"""Compute nonnormal entries from dirstate's dmap"""
				res = set()
				for f, e in dmap.iteritems():
				if e[0] != 'n' or e[3] == -1:
				res.add(f)
				return res

				def checkconsistency(ui, orig, dmap, _nonnormalset, label):
				"""Compute nonnormalset from dmap, check that it matches _nonnormalset"""
				nonnormalcomputedmap = nonnormalentries(dmap)
				if _nonnormalset != nonnormalcomputedmap:
				ui.develwarn("%s call to %s\n" % (label, orig), config='dirstate')
				ui.develwarn("inconsistency in nonnormalset\n", config='dirstate')
				ui.develwarn("[nonnormalset] %s\n" % _nonnormalset, config='dirstate')
				ui.develwarn("[map] %s\n" % nonnormalcomputedmap, config='dirstate')

				def _checkdirstate(orig, self, arg):
				"""Check nonnormal set consistency before and after the call to orig"""
				checkconsistency(self._ui, orig, self._map, self._nonnormalset, "before")
				r = orig(self, arg)
				checkconsistency(self._ui, orig, self._map, self._nonnormalset, "after")
				return r

				def extsetup(ui):
				"""Wrap functions modifying dirstate to check nonnormalset consistency"""
				dirstatecl = dirstate.dirstate
				devel = ui.configbool('devel', 'all-warnings')
				paranoid = ui.configbool('experimental', 'nonnormalparanoidcheck')
				if devel:
				extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate)
				if paranoid:
				# We don't do all these checks when paranoid is disable as it would
				# make the extension run very slowly on large repos
				extensions.wrapfunction(dirstatecl, 'normallookup', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)