##// END OF EJS Templates
merge: force an exception message to bytes before printing as a warning...
Matt Harbison -
r47519:39f23d20 stable
parent child Browse files
Show More
@@ -20,6 +20,7 b' from .node import ('
20 nullrev,
20 nullrev,
21 )
21 )
22 from .thirdparty import attr
22 from .thirdparty import attr
23 from .utils import stringutil
23 from . import (
24 from . import (
24 copies,
25 copies,
25 encoding,
26 encoding,
@@ -1341,7 +1342,7 b' def batchremove(repo, wctx, actions):'
1341 except OSError as inst:
1342 except OSError as inst:
1342 repo.ui.warn(
1343 repo.ui.warn(
1343 _(b"update failed to remove %s: %s!\n")
1344 _(b"update failed to remove %s: %s!\n")
1344 % (f, pycompat.bytestr(inst.strerror))
1345 % (f, stringutil.forcebytestr(inst.strerror))
1345 )
1346 )
1346 if i == 100:
1347 if i == 100:
1347 yield i, f
1348 yield i, f
General Comments 0
You need to be logged in to leave comments. Login now