Show More
@@ -715,11 +715,13 b' class fileobjectobserver(object):' | |||||
715 | def _writedata(self, data): |
|
715 | def _writedata(self, data): | |
716 | if not self.logdata: |
|
716 | if not self.logdata: | |
717 | self.fh.write('\n') |
|
717 | self.fh.write('\n') | |
|
718 | self.fh.flush() | |||
718 | return |
|
719 | return | |
719 |
|
720 | |||
720 | # Simple case writes all data on a single line. |
|
721 | # Simple case writes all data on a single line. | |
721 | if b'\n' not in data: |
|
722 | if b'\n' not in data: | |
722 | self.fh.write(': %s\n' % escapedata(data)) |
|
723 | self.fh.write(': %s\n' % escapedata(data)) | |
|
724 | self.fh.flush() | |||
723 | return |
|
725 | return | |
724 |
|
726 | |||
725 | # Data with newlines is written to multiple lines. |
|
727 | # Data with newlines is written to multiple lines. | |
@@ -727,6 +729,7 b' class fileobjectobserver(object):' | |||||
727 | lines = data.splitlines(True) |
|
729 | lines = data.splitlines(True) | |
728 | for line in lines: |
|
730 | for line in lines: | |
729 | self.fh.write('%s> %s\n' % (self.name, escapedata(line))) |
|
731 | self.fh.write('%s> %s\n' % (self.name, escapedata(line))) | |
|
732 | self.fh.flush() | |||
730 |
|
733 | |||
731 | def read(self, res, size=-1): |
|
734 | def read(self, res, size=-1): | |
732 | if not self.reads: |
|
735 | if not self.reads: |
@@ -1077,6 +1077,7 b' def unbundle(repo, proto, heads):' | |||||
1077 | util.stderr.write("abort: %s\n" % exc) |
|
1077 | util.stderr.write("abort: %s\n" % exc) | |
1078 | if exc.hint is not None: |
|
1078 | if exc.hint is not None: | |
1079 | util.stderr.write("(%s)\n" % exc.hint) |
|
1079 | util.stderr.write("(%s)\n" % exc.hint) | |
|
1080 | util.stderr.flush() | |||
1080 | return pushres(0, output.getvalue() if output else '') |
|
1081 | return pushres(0, output.getvalue() if output else '') | |
1081 | except error.PushRaced: |
|
1082 | except error.PushRaced: | |
1082 | return pusherr(pycompat.bytestr(exc), |
|
1083 | return pusherr(pycompat.bytestr(exc), |
General Comments 0
You need to be logged in to leave comments.
Login now