Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/bundle2.py @ 35136:2b72bc88043f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: only seek to beginning of part in bundlerepo For reasons still not yet fully understood by me, bundlerepo requires its changegroup bundle2 part to be seeked to beginning after part iteration. As far as I can tell, it is the only bundle2 part consumer that relies on this behavior. This seeking was performed in the generic iterparts() API. Again, I don't fully understand why it was here and not in bundlerepo. Probably historical reasons. What I do know is that all other bundle2 part consumers don't need this special behavior (assuming the tests are comprehensive). So, we move the code from bundle2's iterparts() to bundlerepo's consumption of iterparts(). Differential Revision: https://phab.mercurial-scm.org/D1389
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 13 Nov 2017 20:12:00 -0800
parents db5038525718
children da91e7309daf
comparison
equal deleted inserted replaced
35135:db5038525718 35136:2b72bc88043f
857 part = seekableunbundlepart(self.ui, headerblock, self._fp) 857 part = seekableunbundlepart(self.ui, headerblock, self._fp)
858 yield part 858 yield part
859 # Ensure part is fully consumed so we can start reading the next 859 # Ensure part is fully consumed so we can start reading the next
860 # part. 860 # part.
861 part.consume() 861 part.consume()
862 # But then seek back to the beginning so the code consuming this 862
863 # generator has a part that starts at 0.
864 part.seek(0, os.SEEK_SET)
865 headerblock = self._readpartheader() 863 headerblock = self._readpartheader()
866 indebug(self.ui, 'end of bundle2 stream') 864 indebug(self.ui, 'end of bundle2 stream')
867 865
868 def _readpartheader(self): 866 def _readpartheader(self):
869 """reads a part header size and return the bytes blob 867 """reads a part header size and return the bytes blob