upstream/mercurial-mirror Files · hgext/narrow/narrowdirstate.py

wireprotov2peer: wait for initial object before resolving future...

wireprotov2peer: wait for initial object before resolving future As part of rolling out wireprotov2 with redirect support, I encountered an edge case with regards to future resolution. Essentially, the initial response frame from the server did not fully decode the initial CBOR object. The frame wasn't marked as EOS. In the previous code, we resolved the future for the request to response.objects(), which mapped to the commandresponse instance which would eventually produce a redirect. Upon receiving subsequent data, the initial CBOR object containing the redirect would be decoded and we'd process the redirect. However, the future would already have been resolved with the initial commandresponse.objects() and the client iterating over the objects wouldn't receive any objects from the redirect because the redirect was populating a different commandresponse instance! This commit changes the logic so we don't resolve futures until the initial CBOR response object is fully decoded or until EOS occurs. In cases where there is an empty or partial frame associated with a redirect, the future will now resolve with the commandresponse containing the proper series of decoded objects.

Martin von Zweigbergk - - Load All Authors

File last commit:

r40123:1d09ba0d default


                r40790:15a64330

stable

Download file

             narrowdirstate.py
        
                    63 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / narrow / narrowdirstate.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones

      #

      # Copyright 2017 Google, Inc.

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      from mercurial.i18n import _

      from mercurial import (

          error,

      )

      def wrapdirstate(repo, dirstate):

          """Add narrow spec dirstate ignore, block changes outside narrow spec."""

          def _editfunc(fn):

              def _wrapper(self, *args):

                  narrowmatch = repo.narrowmatch()

                  for f in args:

                      if f is not None and not narrowmatch(f) and f not in self:

                          raise error.Abort(_("cannot track '%s' - it is outside " +

                              "the narrow clone") % f)

                  return fn(self, *args)

              return _wrapper

          class narrowdirstate(dirstate.__class__):

              # Prevent adding/editing/copying/deleting files that are outside the

              # sparse checkout

              @_editfunc

              def normal(self, *args):

                  return super(narrowdirstate, self).normal(*args)

              @_editfunc

              def add(self, *args):

                  return super(narrowdirstate, self).add(*args)

              @_editfunc

              def normallookup(self, *args):

                  return super(narrowdirstate, self).normallookup(*args)

              @_editfunc

              def copy(self, *args):

                  return super(narrowdirstate, self).copy(*args)

              @_editfunc

              def remove(self, *args):

                  return super(narrowdirstate, self).remove(*args)

              @_editfunc

              def merge(self, *args):

                  return super(narrowdirstate, self).merge(*args)

              def rebuild(self, parent, allfiles, changedfiles=None):

                  if changedfiles is None:

                      # Rebuilding entire dirstate, let's filter allfiles to match the

                      # narrowspec.

                      allfiles = [f for f in allfiles if repo.narrowmatch()(f)]

                  super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles)

          dirstate.__class__ = narrowdirstate

          return dirstate

	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

				# narrowdirstate.py - extensions to mercurial dirstate to support narrow clones
				#
				# Copyright 2017 Google, Inc.
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from mercurial.i18n import _
				from mercurial import (
				error,
				)

				def wrapdirstate(repo, dirstate):
				"""Add narrow spec dirstate ignore, block changes outside narrow spec."""

				def _editfunc(fn):
				def _wrapper(self, *args):
				narrowmatch = repo.narrowmatch()
				for f in args:
				if f is not None and not narrowmatch(f) and f not in self:
				raise error.Abort(_("cannot track '%s' - it is outside " +
				"the narrow clone") % f)
				return fn(self, *args)
				return _wrapper

				class narrowdirstate(dirstate.__class__):
				# Prevent adding/editing/copying/deleting files that are outside the
				# sparse checkout
				@_editfunc
				def normal(self, *args):
				return super(narrowdirstate, self).normal(*args)

				@_editfunc
				def add(self, *args):
				return super(narrowdirstate, self).add(*args)

				@_editfunc
				def normallookup(self, *args):
				return super(narrowdirstate, self).normallookup(*args)

				@_editfunc
				def copy(self, *args):
				return super(narrowdirstate, self).copy(*args)

				@_editfunc
				def remove(self, *args):
				return super(narrowdirstate, self).remove(*args)

				@_editfunc
				def merge(self, *args):
				return super(narrowdirstate, self).merge(*args)

				def rebuild(self, parent, allfiles, changedfiles=None):
				if changedfiles is None:
				# Rebuilding entire dirstate, let's filter allfiles to match the
				# narrowspec.
				allfiles = [f for f in allfiles if repo.narrowmatch()(f)]
				super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles)

				dirstate.__class__ = narrowdirstate
				return dirstate