Show More
@@ -362,7 +362,7 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
362 | ui.debug(fp.getvalue()) |
|
362 | ui.debug(fp.getvalue()) | |
363 | patch.internalpatch(ui, repo, fp, 1, eolmode=None) |
|
363 | patch.internalpatch(ui, repo, fp, 1, eolmode=None) | |
364 | except error.PatchError as err: |
|
364 | except error.PatchError as err: | |
365 | raise error.Abort(str(err)) |
|
365 | raise error.Abort(pycompat.bytestr(err)) | |
366 | del fp |
|
366 | del fp | |
367 |
|
367 | |||
368 | # 4. We prepared working directory according to filtered |
|
368 | # 4. We prepared working directory according to filtered | |
@@ -1432,7 +1432,7 b' def tryimportone(ui, repo, hunk, parents' | |||||
1432 | files=files, eolmode=None, similarity=sim / 100.0) |
|
1432 | files=files, eolmode=None, similarity=sim / 100.0) | |
1433 | except error.PatchError as e: |
|
1433 | except error.PatchError as e: | |
1434 | if not partial: |
|
1434 | if not partial: | |
1435 | raise error.Abort(str(e)) |
|
1435 | raise error.Abort(pycompat.bytestr(e)) | |
1436 | if partial: |
|
1436 | if partial: | |
1437 | rejects = True |
|
1437 | rejects = True | |
1438 |
|
1438 | |||
@@ -3043,7 +3043,7 b' def _performrevert(repo, parents, ctx, a' | |||||
3043 | try: |
|
3043 | try: | |
3044 | patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) |
|
3044 | patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) | |
3045 | except error.PatchError as err: |
|
3045 | except error.PatchError as err: | |
3046 | raise error.Abort(str(err)) |
|
3046 | raise error.Abort(pycompat.bytestr(err)) | |
3047 | del fp |
|
3047 | del fp | |
3048 | else: |
|
3048 | else: | |
3049 | for f in actions['revert'][0]: |
|
3049 | for f in actions['revert'][0]: |
@@ -1197,7 +1197,7 b' def bundle(ui, repo, fname, dest=None, *' | |||||
1197 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1197 | bcompression, cgversion, params = exchange.parsebundlespec( | |
1198 | repo, bundletype, strict=False) |
|
1198 | repo, bundletype, strict=False) | |
1199 | except error.UnsupportedBundleSpecification as e: |
|
1199 | except error.UnsupportedBundleSpecification as e: | |
1200 | raise error.Abort(str(e), |
|
1200 | raise error.Abort(pycompat.bytestr(e), | |
1201 | hint=_("see 'hg help bundlespec' for supported " |
|
1201 | hint=_("see 'hg help bundlespec' for supported " | |
1202 | "values for --type")) |
|
1202 | "values for --type")) | |
1203 |
|
1203 |
@@ -1811,7 +1811,7 b' def debugpushkey(ui, repopath, namespace' | |||||
1811 | if keyinfo: |
|
1811 | if keyinfo: | |
1812 | key, old, new = keyinfo |
|
1812 | key, old, new = keyinfo | |
1813 | r = target.pushkey(namespace, key, old, new) |
|
1813 | r = target.pushkey(namespace, key, old, new) | |
1814 | ui.status(str(r) + '\n') |
|
1814 | ui.status(pycompat.bytestr(r) + '\n') | |
1815 | return not r |
|
1815 | return not r | |
1816 | else: |
|
1816 | else: | |
1817 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
|
1817 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
@@ -1123,7 +1123,7 b' class svnsubrepo(abstractsubrepo):' | |||||
1123 | doc = xml.dom.minidom.parseString(output) |
|
1123 | doc = xml.dom.minidom.parseString(output) | |
1124 | paths = [] |
|
1124 | paths = [] | |
1125 | for e in doc.getElementsByTagName('entry'): |
|
1125 | for e in doc.getElementsByTagName('entry'): | |
1126 | kind = str(e.getAttribute('kind')) |
|
1126 | kind = pycompat.bytestr(e.getAttribute('kind')) | |
1127 | if kind != 'file': |
|
1127 | if kind != 'file': | |
1128 | continue |
|
1128 | continue | |
1129 | name = ''.join(c.data for c |
|
1129 | name = ''.join(c.data for c |
@@ -1043,7 +1043,7 b' def unbundle(repo, proto, heads):' | |||||
1043 | util.stderr.write("(%s)\n" % exc.hint) |
|
1043 | util.stderr.write("(%s)\n" % exc.hint) | |
1044 | return pushres(0, output.getvalue() if output else '') |
|
1044 | return pushres(0, output.getvalue() if output else '') | |
1045 | except error.PushRaced: |
|
1045 | except error.PushRaced: | |
1046 | return pusherr(str(exc), |
|
1046 | return pusherr(pycompat.bytestr(exc), | |
1047 | output.getvalue() if output else '') |
|
1047 | output.getvalue() if output else '') | |
1048 |
|
1048 | |||
1049 | bundler = bundle2.bundle20(repo.ui) |
|
1049 | bundler = bundle2.bundle20(repo.ui) |
General Comments 0
You need to be logged in to leave comments.
Login now