Mercurial > hg
changeset 25315:e28245b0da56
bundle2: handle new line in 'outdebug' function
Now that we have a prefix, it make sense to assume all output will be on a
single line.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 26 May 2015 23:02:19 -0700 |
| parents | 18c2bcc2c9d5 |
| children | a4acf019dd5b |
| files | mercurial/bundle2.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Tue May 26 22:57:35 2015 -0700 +++ b/mercurial/bundle2.py Tue May 26 23:02:19 2015 -0700 @@ -175,7 +175,7 @@ def outdebug(ui, message): """debug regarding output stream (bundling)""" - ui.debug('bundle2-output: %s' % message) + ui.debug('bundle2-output: %s\n' % message) def validateparttype(parttype): """raise ValueError if a parttype contains invalid character""" @@ -468,20 +468,20 @@ # methods used to generate the bundle2 stream def getchunks(self): - outdebug(self.ui, 'start emission of %s stream\n' % self._magicstring) + outdebug(self.ui, 'start emission of %s stream' % self._magicstring) yield self._magicstring param = self._paramchunk() - outdebug(self.ui, 'bundle parameter: %s\n' % param) + outdebug(self.ui, 'bundle parameter: %s' % param) yield _pack(_fstreamparamsize, len(param)) if param: yield param - outdebug(self.ui, 'start of parts\n') + outdebug(self.ui, 'start of parts') for part in self._parts: - outdebug(self.ui, 'bundle part: "%s"\n' % part.type) + outdebug(self.ui, 'bundle part: "%s"' % part.type) for chunk in part.getchunks(): yield chunk - outdebug(self.ui, 'end of bundle\n') + outdebug(self.ui, 'end of bundle') yield _pack(_fpartheadersize, 0) def _paramchunk(self):