This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7037

context: make copies related function return None or a valid value
ClosedPublic

Authored by marmoute on Oct 9 2019, 6:43 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4296cc3c4ae1: changelog: make copies related function return None or a valid value
Summary

With the previous code, existing but empty value where not "decoded", leading to
the method returning one of None, some valid value (list or dict) or
b''.

On a general basis, not explicitly checking for None is a source of bugs.
Having a clean return types will help the side-data copies code in future
changesets.

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

marmoute created this revision.Oct 9 2019, 6:43 PM
marmoute added a commit: rHG4296cc3c4ae1: changelog: make copies related function return None or a valid value.Oct 9 2019, 7:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4296cc3c4ae1: changelog: make copies related function return None or a valid value (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (16 lines)

Diff 17026

mercurial/changelog.py

if off[2] == off[3]: if off[2] == off[3]:
return [] return []
return self._text[off[2] + 1 : off[3]].split(b'\n') return self._text[off[2] + 1 : off[3]].split(b'\n')
@property @property
def filesadded(self): def filesadded(self):
rawindices = self.extra.get(b'filesadded') rawindices = self.extra.get(b'filesadded')
return rawindices and decodefileindices(self.files, rawindices) if rawindices is None:
return None
return decodefileindices(self.files, rawindices)
@property @property
def filesremoved(self): def filesremoved(self):
rawindices = self.extra.get(b'filesremoved') rawindices = self.extra.get(b'filesremoved')
return rawindices and decodefileindices(self.files, rawindices) if rawindices is None:
return None
return decodefileindices(self.files, rawindices)
@property @property
def p1copies(self): def p1copies(self):
rawcopies = self.extra.get(b'p1copies') rawcopies = self.extra.get(b'p1copies')
return rawcopies and decodecopies(self.files, rawcopies) if rawcopies is None:
return None
return decodecopies(self.files, rawcopies)
@property @property
def p2copies(self): def p2copies(self):
rawcopies = self.extra.get(b'p2copies') rawcopies = self.extra.get(b'p2copies')
return rawcopies and decodecopies(self.files, rawcopies) if rawcopies is None:
return None
return decodecopies(self.files, rawcopies)
@property @property
def description(self): def description(self):
return encoding.tolocal(self._text[self._offsets[3] + 2 :]) return encoding.tolocal(self._text[self._offsets[3] + 2 :])
class changelog(revlog.revlog): class changelog(revlog.revlog):
def __init__(self, opener, trypending=False): def __init__(self, opener, trypending=False):