This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11235

typing: add several assertions to dirstatemap to appease pytype
ClosedPublic

Authored by mharbison72 on Jul 30 2021, 1:13 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa11520e66ade: typing: add several assertions to dirstatemap to appease pytype
rHG460e479be66e: typing: add several assertions to dirstatemap to appease pytype
Summary

I think it's been mentioned in IRC that these can't be None in this case. This
fixes:

File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 213, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
  No attribute '__and__' on None or '__rand__' on int
Called from (traceback):
  line 290, in reset_state
File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 214, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
  No attribute '__and__' on None or '__rand__' on int
Called from (traceback):
  line 290, in reset_state

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.Jul 30 2021, 1:13 AM
mharbison72 added a commit: rHG460e479be66e: typing: add several assertions to dirstatemap to appease pytype.Jul 30 2021, 11:11 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG460e479be66e: typing: add several assertions to dirstatemap to appease pytype (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.
Alphare added a subscriber: Alphare.Aug 2 2021, 12:00 PM

For some reason, phabsend did not record the branch information (which was stable, according to Matt Harbison), so this went on default. It also shouldn't have landed on default at all since we're in a freeze, but the impact is minimal. I'll graft it to stable soon.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (3 lines)

Diff 29746

mercurial/dirstatemap.py

mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
elif possibly_dirty: elif possibly_dirty:
state = b'n' state = b'n'
size = NONNORMAL size = NONNORMAL
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
else: else:
assert size != FROM_P2 assert size != FROM_P2
assert size != NONNORMAL assert size != NONNORMAL
assert size is not None
assert mtime is not None
state = b'n' state = b'n'
size = size & rangemask size = size & rangemask
mtime = mtime & rangemask mtime = mtime & rangemask
assert state is not None assert state is not None
assert size is not None assert size is not None
assert mtime is not None assert mtime is not None
old_entry = self.get(f) old_entry = self.get(f)
self._dirs_incr(f, old_entry) self._dirs_incr(f, old_entry)