Show More
@@ -318,7 +318,7 def _dosign(ui, repo, *revs, **opts): | |||||
318 | repo.commit(message, opts['user'], opts['date'], match=msigs, |
|
318 | repo.commit(message, opts['user'], opts['date'], match=msigs, | |
319 | editor=editor) |
|
319 | editor=editor) | |
320 | except ValueError as inst: |
|
320 | except ValueError as inst: | |
321 | raise error.Abort(str(inst)) |
|
321 | raise error.Abort(pycompat.bytestr(inst)) | |
322 |
|
322 | |||
323 | def node2txt(repo, node, ver): |
|
323 | def node2txt(repo, node, ver): | |
324 | """map a manifest into some text""" |
|
324 | """map a manifest into some text""" |
@@ -508,7 +508,7 def journal(ui, repo, *args, **opts): | |||||
508 | ctx = repo[hash] |
|
508 | ctx = repo[hash] | |
509 | displayer.show(ctx) |
|
509 | displayer.show(ctx) | |
510 | except error.RepoLookupError as e: |
|
510 | except error.RepoLookupError as e: | |
511 | fm.write('repolookuperror', "%s\n\n", str(e)) |
|
511 | fm.write('repolookuperror', "%s\n\n", pycompat.bytestr(e)) | |
512 | displayer.close() |
|
512 | displayer.close() | |
513 |
|
513 | |||
514 | fm.end() |
|
514 | fm.end() |
@@ -598,7 +598,7 def overridecopy(orig, ui, repo, pats, o | |||||
598 | try: |
|
598 | try: | |
599 | result = orig(ui, repo, pats, opts, rename) |
|
599 | result = orig(ui, repo, pats, opts, rename) | |
600 | except error.Abort as e: |
|
600 | except error.Abort as e: | |
601 | if str(e) != _('no files to copy'): |
|
601 | if pycompat.bytestr(e) != _('no files to copy'): | |
602 | raise e |
|
602 | raise e | |
603 | else: |
|
603 | else: | |
604 | nonormalfiles = True |
|
604 | nonormalfiles = True | |
@@ -705,7 +705,7 def overridecopy(orig, ui, repo, pats, o | |||||
705 | lfdirstate.add(destlfile) |
|
705 | lfdirstate.add(destlfile) | |
706 | lfdirstate.write() |
|
706 | lfdirstate.write() | |
707 | except error.Abort as e: |
|
707 | except error.Abort as e: | |
708 | if str(e) != _('no files to copy'): |
|
708 | if pycompat.bytestr(e) != _('no files to copy'): | |
709 | raise e |
|
709 | raise e | |
710 | else: |
|
710 | else: | |
711 | nolfiles = True |
|
711 | nolfiles = True |
General Comments 0
You need to be logged in to leave comments.
Login now