equal
deleted
inserted
replaced
18 modifiednodeid, |
18 modifiednodeid, |
19 nullid, |
19 nullid, |
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, |
26 error, |
27 error, |
27 filemerge, |
28 filemerge, |
1341 try: |
1342 try: |
1342 wctx[f].remove(ignoremissing=True) |
1343 wctx[f].remove(ignoremissing=True) |
1343 except OSError as inst: |
1344 except OSError as inst: |
1344 repo.ui.warn( |
1345 repo.ui.warn( |
1345 _(b"update failed to remove %s: %s!\n") |
1346 _(b"update failed to remove %s: %s!\n") |
1346 % (f, pycompat.bytestr(inst.strerror)) |
1347 % (f, stringutil.forcebytestr(inst.strerror)) |
1347 ) |
1348 ) |
1348 if i == 100: |
1349 if i == 100: |
1349 yield i, f |
1350 yield i, f |
1350 i = 0 |
1351 i = 0 |
1351 i += 1 |
1352 i += 1 |