This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7682

patch: make __repr__() return str
ClosedPublic

Authored by mharbison72 on Dec 16 2019, 11:46 PM.

Details

Reviewers
pulkit
dlax
Group Reviewers
hg-reviewers
Commits
rHG727cf6acadfe: patch: make __repr__() return str
Summary

Caught by pytype:

line 969, in __repr__: Function bytes.join was called with the wrong arguments [wrong-arg-types]
Expected: (self, iterable: Iterable[bytes])
Actually passed: (self, iterable: Iterator[str])

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

mharbison72 created this revision.Dec 16 2019, 11:46 PM
pulkit accepted this revision.Dec 17 2019, 3:08 AM
This revision is now accepted and ready to land.Dec 17 2019, 3:08 AM
dlax accepted this revision.Dec 17 2019, 3:26 AM
dlax added a subscriber: dlax.
dlax added inline comments.
mercurial/patch.py
966

Somehow unrelated, but self.files() returns a list of bytes I think. So this will lead to something like "<header b'file' b'file'>". But maybe this is okay? (at least it wouldn't crash now)

mharbison72 added a commit: rHG727cf6acadfe: patch: make __repr__() return str.Dec 17 2019, 3:51 AM
Closed by commit rHG727cf6acadfe: patch: make __repr__() return str (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 18802

mercurial/patch.py

return [fromfile, tofile] return [fromfile, tofile]
else: else:
return self.diff_re.match(self.header[0]).groups() return self.diff_re.match(self.header[0]).groups()
def filename(self): def filename(self):
return self.files()[-1] return self.files()[-1]
def __repr__(self): def __repr__(self):
return b'<header %s>' % (b' '.join(map(repr, self.files()))) return '<header %s>' % (' '.join(map(repr, self.files())))
dlaxUnsubmitted
Not Done

Somehow unrelated, but self.files() returns a list of bytes I think. So this will lead to something like "<header b'file' b'file'>". But maybe this is okay? (at least it wouldn't crash now)

dlax: Somehow unrelated, but `self.files()` returns a list of bytes I think. So this will lead to…
def isnewfile(self): def isnewfile(self):
return any(self.newfile_re.match(h) for h in self.header) return any(self.newfile_re.match(h) for h in self.header)
def special(self): def special(self):
# Special files are shown only at the header level and not at the hunk # Special files are shown only at the header level and not at the hunk
# level for example a file that has been deleted is a special file. # level for example a file that has been deleted is a special file.
# The user cannot change the content of the operation, in the case of # The user cannot change the content of the operation, in the case of