This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8091

py3: fully fix bundlepart.__repr__ to return str not bytes
ClosedPublic

Authored by spectral on Feb 6 2020, 6:55 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG74172a234dd3: py3: fully fix bundlepart.__repr__ to return str not bytes
Summary

My previous fix did not fully fix the issue: it would attempt to use
%-formatting to combine two strs into a bytes, which won't work. Let's just
switch the entire function to operating in strs. This can cause a small output
difference that will likely not be noticed since no one noticed that the method
wasn't working at all before: if id or type are not-None, they'll be shown
as b'val' instead of val. Since this is a debugging aid and these strings
shouldn't be shown to the user, slightly rough output is most likely fine and
it's likely not worthwhile to add the necessary conditionals to marginally
improve it.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

spectral created this revision.Feb 6 2020, 6:55 PM
marmoute accepted this revision.Feb 7 2020, 1:43 PM
marmoute added a subscriber: marmoute.

I guess we could build the string, and then turn it into a bytes. That seems simple enough to be worth doing. Howevr you are fixing a bug here and as you poitned out, this __repr__ is not really important. So you get a stamp.

pulkit accepted this revision.Feb 7 2020, 3:20 PM
This revision is now accepted and ready to land.Feb 7 2020, 3:20 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (5 lines)

Diff 19978

mercurial/bundle2.py

self._seenparams.add(pname) self._seenparams.add(pname)
# status of the part's generation: # status of the part's generation:
# - None: not started, # - None: not started,
# - False: currently generated, # - False: currently generated,
# - True: generation done. # - True: generation done.
self._generated = None self._generated = None
self.mandatory = mandatory self.mandatory = mandatory
@encoding.strmethod
def __repr__(self): def __repr__(self):
cls = b"%s.%s" % (self.__class__.__module__, self.__class__.__name__) cls = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
return b'<%s object at %x; id: %s; type: %s; mandatory: %s>' % ( return '<%s object at %x; id: %s; type: %s; mandatory: %s>' % (
cls, cls,
id(self), id(self),
self.id, self.id,
self.type, self.type,
self.mandatory, self.mandatory,
) )
def copy(self): def copy(self):