This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10213

obsutil: maintain a homogenous list when computing successors
ClosedPublic

Authored by mharbison72 on Mar 13 2021, 2:34 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGd35063ebd761: obsutil: maintain a homogenous list when computing successors

Summary

In practice, this wasn't a problem because of an internal check for an empty
list, but it avoids the following pytype error:

File "/mnt/c/Users/Matt/hg/mercurial/obsutil.py", line 823, in successorsandmarkers: No attribute 'markers' on List[nothing] [attribute-error]
  In Union[Any, List[nothing], _succs]

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.Mar 13 2021, 2:34 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 13 2021, 2:34 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

mharbison72 added a child revision: D10214: typing: add assertions to localrepo.py to appease pytype.Mar 13 2021, 2:34 PM

pulkit accepted this revision.Mar 18 2021, 2:59 PM

This revision is now accepted and ready to land.Mar 18 2021, 2:59 PM

mharbison72 added a commit: rHGd35063ebd761: obsutil: maintain a homogenous list when computing successors.Mar 18 2021, 5:06 PM

Closed by commit rHGd35063ebd761: obsutil: maintain a homogenous list when computing successors (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/obsutil.py (2 lines)

Status	Author	Revision
Closed	mharbison72	D10215 typing: rewrite a conditional assignment to unconfuse pytype
Closed	mharbison72	D10214 typing: add assertions to localrepo.py to appease pytype
Closed	mharbison72	D10213 obsutil: maintain a homogenous list when computing successors
Closed	mharbison72	D10212 typing: add an assertion to verify.py to appease pytype
Closed	mharbison72	D10211 typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
Closed	mharbison72	D10210 crecord: null out the curses attribute with `None` on failure to import
Closed	mharbison72	D10209 typing: fix directives mangled by black
Closed	mharbison72	D10208 typing: disable module attribute warnings for properly conditionalized code
Closed	mharbison72	D10207 typing: disable import error warnings that are already handled
Closed	mharbison72	D10206 typing: disable a few errors when accessing Windows specific attributes
Closed	mharbison72	D10205 typing: disable a few errors calling py3.7+ functions in resourceutil.py
Closed	mharbison72	D10204 wsgicgi: switch the default PATH_INFO back to str
Closed	mharbison72	D10203 crecord: convert an instance of bytes to str
Closed	mharbison72	D10202 crecord: change str literals to byte literals
Closed	mharbison72	D10201 bisect: replace a missing method on the list primitive
Closed	mharbison72	D10183 typing: disable a module-attr warning in the worker module's py2 code
Closed	mharbison72	D10182 wireprotoserver: convert ErrorResponse to bytes
Closed	mharbison72	D10181 verify: convert an exception to bytes before logging
Closed	mharbison72	D10180 typing: add an assertion to the upgrade engine to help pytype
Closed	mharbison72	D10179 subrepo: handle unexpected file types from git gracefully
Closed	mharbison72	D10178 patch: convert a UI message to bytes when editing a patch
Closed	mharbison72	D10177 merge: force an exception message to bytes before printing as a warning
Closed	mharbison72	D10176 hg: convert an exception to bytes in the repo creation exception handler
Closed	mharbison72	D10175 typing: add an assertion instead of blacklisting mercurial/extensions.py
Closed	mharbison72	D10174 debug: convert a few exceptions to bytes before wrapping in another error
Closed	mharbison72	D10173 grep: convert an exception to bytes for a warning message
Closed	mharbison72	D10172 morestatus: convert a UI message about merge conflicts to bytes
Closed	mharbison72	D10171 changegroup: convert a warning message to bytes
Closed	mharbison72	D10170 branchmap: force Exception to bytes before logging
Closed	mharbison72	D10169 nodemap: convert error message to bytes
Closed	mharbison72	D10168 mail: convert SMTPException to bytes before passing to error.Abort()
Closed	mharbison72	D10167 typing: switch an argument type to the generic form
Closed	mharbison72	D10166 typing: ensure that error.Abort is given bytes
Closed	mharbison72	D10165 typing: fix a suppression directive that was mangled by black formatting

Diff 26506

mercurial/obsutil.py

	if not ctx.obsolete():			if not ctx.obsolete():
	return None			return None

	ssets = successorssets(repo, ctx.node(), closest=True)			ssets = successorssets(repo, ctx.node(), closest=True)

	# closestsuccessors returns an empty list for pruned revisions, remap it			# closestsuccessors returns an empty list for pruned revisions, remap it
	# into a list containing an empty list for future processing			# into a list containing an empty list for future processing
	if ssets == []:			if ssets == []:
	ssets = [[]]			ssets = [_succs()]

	# Try to recover pruned markers			# Try to recover pruned markers
	succsmap = repo.obsstore.successors			succsmap = repo.obsstore.successors
	fullsuccessorsets = [] # successor set + markers			fullsuccessorsets = [] # successor set + markers
	for sset in ssets:			for sset in ssets:
	if sset:			if sset:
	fullsuccessorsets.append(sset)			fullsuccessorsets.append(sset)
	else:			else:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26327		Mar 13 2021, 2:34 PM	★	★
Diff 2	26506	rHGd35063ebd76194ceda2319e2c6a5d7a592f630e3	Mar 12 2021, 9:19 PM	★	★