comparison mercurial/bundle2.py @ 23585:94b25d71dd0f

bundle2.unbundlepart: decouple mandatory from parttype

Encoding whether or not a part is mandatory in the capitalization of the
parttype is unintuitive and error-prone.  This sequence of patches separates
these concerns in the API to reduce programmer error and pave the way for
a potential change in how this information is transmitted over the wire.

This patch separates the two pieces of information when reading the part header
so that it's unnecessary to know how they were combined during transmission.

23584:db03ed8cbfa3

                unknownparams = list(unknownparams)
                unknownparams.sort()
                raise error.UnsupportedPartError(parttype=key,
                                               params=unknownparams)
        except error.UnsupportedPartError, exc:
            if key != parttype: # mandatory parts
                raise
            op.ui.debug('ignoring unsupported advisory part %s\n' % exc)
            return # skip to part processing

        # handler is called outside the above try block so that we don't

        self.advisoryparams = None
        self.params = None
        self.mandatorykeys = ()
        self._payloadstream = None
        self._readheader()

    def _fromheader(self, size):
        """return the next <size> byte from the header"""
        offset = self._headeroffset
        data = self._headerdata[offset:(offset + size)]

        typesize = self._unpackheader(_fparttypesize)[0]
        self.type = self._fromheader(typesize)
        self.ui.debug('part type: "%s"\n' % self.type)
        self.id = self._unpackheader(_fpartid)[0]
        self.ui.debug('part id: "%s"\n' % self.id)
        ## reading parameters
        # param count
        mancount, advcount = self._unpackheader(_fpartparamcount)
        self.ui.debug('part parameters: %i\n' % (mancount + advcount))
        # param size

23585:94b25d71dd0f

                unknownparams = list(unknownparams)
                unknownparams.sort()
                raise error.UnsupportedPartError(parttype=key,
                                               params=unknownparams)
        except error.UnsupportedPartError, exc:
            if part.mandatory: # mandatory parts
                raise
            op.ui.debug('ignoring unsupported advisory part %s\n' % exc)
            return # skip to part processing

        # handler is called outside the above try block so that we don't

        self.advisoryparams = None
        self.params = None
        self.mandatorykeys = ()
        self._payloadstream = None
        self._readheader()
        self._mandatory = None

    def _fromheader(self, size):
        """return the next <size> byte from the header"""
        offset = self._headeroffset
        data = self._headerdata[offset:(offset + size)]

        typesize = self._unpackheader(_fparttypesize)[0]
        self.type = self._fromheader(typesize)
        self.ui.debug('part type: "%s"\n' % self.type)
        self.id = self._unpackheader(_fpartid)[0]
        self.ui.debug('part id: "%s"\n' % self.id)
        # extract mandatory bit from type
        self.mandatory = (self.type != self.type.lower())
        self.type = self.type.lower()
        ## reading parameters
        # param count
        mancount, advcount = self._unpackheader(_fpartparamcount)
        self.ui.debug('part parameters: %i\n' % (mancount + advcount))
        # param size