Show More
@@ -147,7 +147,7 b' def get_log_child(fp, url, paths, start,' | |||||
147 | # Caller may interrupt the iteration |
|
147 | # Caller may interrupt the iteration | |
148 | pickle.dump(None, fp, protocol) |
|
148 | pickle.dump(None, fp, protocol) | |
149 | except Exception as inst: |
|
149 | except Exception as inst: | |
150 | pickle.dump(str(inst), fp, protocol) |
|
150 | pickle.dump(util.forcebytestr(inst), fp, protocol) | |
151 | else: |
|
151 | else: | |
152 | pickle.dump(None, fp, protocol) |
|
152 | pickle.dump(None, fp, protocol) | |
153 | fp.flush() |
|
153 | fp.flush() |
@@ -723,7 +723,8 b' class queue(object):' | |||||
723 | try: |
|
723 | try: | |
724 | os.unlink(undo) |
|
724 | os.unlink(undo) | |
725 | except OSError as inst: |
|
725 | except OSError as inst: | |
726 |
self.ui.warn(_('error removing undo: %s\n') % |
|
726 | self.ui.warn(_('error removing undo: %s\n') % | |
|
727 | util.forcebytestr(inst)) | |||
727 |
|
728 | |||
728 | def backup(self, repo, files, copy=False): |
|
729 | def backup(self, repo, files, copy=False): | |
729 | # backup local changes in --force case |
|
730 | # backup local changes in --force case |
@@ -449,7 +449,7 b' def handlechangegroup_widen(op, inpart):' | |||||
449 | except OSError as e: |
|
449 | except OSError as e: | |
450 | if e.errno != errno.ENOENT: |
|
450 | if e.errno != errno.ENOENT: | |
451 | ui.warn(_('error removing %s: %s\n') % |
|
451 | ui.warn(_('error removing %s: %s\n') % | |
452 | (undovfs.join(undofile), str(e))) |
|
452 | (undovfs.join(undofile), util.forcebytestr(e))) | |
453 |
|
453 | |||
454 | # Remove partial backup only if there were no exceptions |
|
454 | # Remove partial backup only if there were no exceptions | |
455 | vfs.unlink(chgrpfile) |
|
455 | vfs.unlink(chgrpfile) |
@@ -187,7 +187,7 b' def do_relink(src, dst, files, ui):' | |||||
187 | relinked += 1 |
|
187 | relinked += 1 | |
188 | savedbytes += sz |
|
188 | savedbytes += sz | |
189 | except OSError as inst: |
|
189 | except OSError as inst: | |
190 | ui.warn('%s: %s\n' % (tgt, str(inst))) |
|
190 | ui.warn('%s: %s\n' % (tgt, util.forcebytestr(inst))) | |
191 |
|
191 | |||
192 | ui.progress(_('relinking'), None) |
|
192 | ui.progress(_('relinking'), None) | |
193 |
|
193 |
General Comments 0
You need to be logged in to leave comments.
Login now