This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11708

fsmonitor: fix traceback about bytes and str incompatibility
ClosedPublic

Authored by Alphare on Oct 20 2021, 4:26 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6fb282ce9113: fsmonitor: fix traceback about bytes and str incompatibility
Summary

This didn't work anymore in Python 3, switching to a repr based reporting does

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Oct 20 2021, 4:26 AM
marmoute accepted this revision.Oct 20 2021, 8:42 AM
Alphare added a commit: rHG6fb282ce9113: fsmonitor: fix traceback about bytes and str incompatibility.Nov 4 2021, 4:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6fb282ce9113: fsmonitor: fix traceback about bytes and str incompatibility (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (4 lines)

Diff 31028

hgext/fsmonitor/__init__.py

except (IOError, OSError): except (IOError, OSError):
self.ui.warn(_(b'warning: unable to write to %s\n') % fn) self.ui.warn(_(b'warning: unable to write to %s\n') % fn)
return return
try: try:
for i, (s1, s2) in enumerate(zip(l1, l2)): for i, (s1, s2) in enumerate(zip(l1, l2)):
if set(s1) != set(s2): if set(s1) != set(s2):
f.write(b'sets at position %d are unequal\n' % i) f.write(b'sets at position %d are unequal\n' % i)
f.write(b'watchman returned: %s\n' % s1) f.write(b'watchman returned: %r\n' % s1)
f.write(b'stat returned: %s\n' % s2) f.write(b'stat returned: %r\n' % s2)
finally: finally:
f.close() f.close()
if isinstance(node1, context.changectx): if isinstance(node1, context.changectx):
ctx1 = node1 ctx1 = node1
else: else:
ctx1 = self[node1] ctx1 = self[node1]
if isinstance(node2, context.changectx): if isinstance(node2, context.changectx):