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