This is an archive of the discontinued Mercurial Phabricator instance.

Differential D530

obsolete: move merge logic on the smaller object
ClosedPublic

Authored by lothiraldan on Aug 28 2017, 3:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc0bbaefc2c5a: obsolete: move merge logic on the smaller object
Summary

Refactor some logic in _succs in order to clean successorssets code.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Aug 28 2017, 3:30 AM
Closed by commit rHGc0bbaefc2c5a: obsolete: move merge logic on the smaller object (authored by lothiraldan). · Explain WhyAug 28 2017, 10:40 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 28 2017, 5:10 PM
martinvonz added inline comments.
mercurial/obsutil.py
568

How long can "seen" get? Short enough that we don't care to make it a set?

Revision Contents
Changeset List

PathPackages
Mmercurial/obsutil.py (24 lines)

Diff 1334

mercurial/obsutil.py

super(_succs, self).__init__(*args, **kwargs) super(_succs, self).__init__(*args, **kwargs)
self.markers = set() self.markers = set()
def copy(self): def copy(self):
new = _succs(self) new = _succs(self)
new.markers = self.markers.copy() new.markers = self.markers.copy()
return new return new
@util.propertycache
def _set(self):
# immutable
return set(self)
def canmerge(self, other):
return self._set.issubset(other._set)
def successorssets(repo, initialnode, closest=False, cache=None): def successorssets(repo, initialnode, closest=False, cache=None):
"""Return set of all latest successors of initial nodes """Return set of all latest successors of initial nodes
The successors set of a changeset A are the group of revisions that succeed The successors set of a changeset A are the group of revisions that succeed
A. It succeeds A as a consistent whole, each revision being only a partial A. It succeeds A as a consistent whole, each revision being only a partial
replacement. By default, the successors set contains non-obsolete replacement. By default, the successors set contains non-obsolete
changesets only, walking the obsolescence graph until reaching a leaf. If changesets only, walking the obsolescence graph until reaching a leaf. If
'closest' is set to True, closest successors-sets are return (the 'closest' is set to True, closest successors-sets are return (the
if part not in newss: if part not in newss:
newss.append(part) newss.append(part)
productresult.append(newss) productresult.append(newss)
markss = productresult markss = productresult
succssets.extend(markss) succssets.extend(markss)
# remove duplicated and subset # remove duplicated and subset
seen = [] seen = []
final = [] final = []
candidate = sorted(((set(s), s) for s in succssets if s), candidate = sorted((s for s in succssets if s),
key=lambda x: len(x[1]), reverse=True) key=len, reverse=True)
for setversion, listversion in candidate: for cand in candidate:
for seenset, seensuccs in seen: for seensuccs in seen:
martinvonzUnsubmitted
Not Done

How long can "seen" get? Short enough that we don't care to make it a set?

martinvonz: How long can "seen" get? Short enough that we don't care to make it a set?
if setversion.issubset(seenset): if cand.canmerge(seensuccs):
seensuccs.markers.update(listversion.markers) seensuccs.markers.update(cand.markers)
break break
else: else:
final.append(listversion) final.append(cand)
seen.append((setversion, listversion)) seen.append(cand)
final.reverse() # put small successors set first final.reverse() # put small successors set first
cache[current] = final cache[current] = final
return cache[initialnode] return cache[initialnode]
def successorsandmarkers(repo, ctx): def successorsandmarkers(repo, ctx):
"""compute the raw data needed for computing obsfate """compute the raw data needed for computing obsfate
Returns a list of dict, one dict per successors set Returns a list of dict, one dict per successors set
""" """