| simonfar |
| Restricted Project |
Renamed upstream. Prevent develwarns.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| """Rebase all descendants of precursors of rev onto rev, thereby | """Rebase all descendants of precursors of rev onto rev, thereby | ||||
| stabilzing any non-obsolete descendants of those precursors. | stabilzing any non-obsolete descendants of those precursors. | ||||
| Takes in an optional dict of options for the rebase command. | Takes in an optional dict of options for the rebase command. | ||||
| If childrenonly is True, only rebases direct children of precursors | If childrenonly is True, only rebases direct children of precursors | ||||
| of rev rather than all descendants of those precursors. | of rev rather than all descendants of those precursors. | ||||
| """ | """ | ||||
| # Get visible descendants of precusors of rev. | # Get visible descendants of precusors of rev. | ||||
| # Excluding obsoleted changesets avoids divergence issues. | # Excluding obsoleted changesets avoids divergence issues. | ||||
| allprecursors = repo.revs('allprecursors(%d)', rev) | allpredecessors = repo.revs('allpredecessors(%d)', rev) | ||||
| fmt = ('%s(%%ld) - %%ld - obsolete()' | fmt = ('%s(%%ld) - %%ld - obsolete()' | ||||
| % ('children' if childrenonly else 'descendants')) | % ('children' if childrenonly else 'descendants')) | ||||
| descendants = repo.revs(fmt, allprecursors, allprecursors) | descendants = repo.revs(fmt, allpredecessors, allpredecessors) | ||||
| # Nothing to do if there are no descendants. | # Nothing to do if there are no descendants. | ||||
| if not descendants: | if not descendants: | ||||
| return | return | ||||
| # Overwrite source and destination, leave all other options. | # Overwrite source and destination, leave all other options. | ||||
| if rebaseopts is None: | if rebaseopts is None: | ||||
| rebaseopts = {} | rebaseopts = {} | ||||
| def _findrestacktargets(repo, base): | def _findrestacktargets(repo, base): | ||||
| """Starting from the given base revision, do a BFS forwards through | """Starting from the given base revision, do a BFS forwards through | ||||
| history, looking for changesets with unstable descendants on their | history, looking for changesets with unstable descendants on their | ||||
| precursors. Returns a list of any such changesets, in a top-down | precursors. Returns a list of any such changesets, in a top-down | ||||
| ordering that will allow all of the descendants of their precursors | ordering that will allow all of the descendants of their precursors | ||||
| to be correctly rebased. | to be correctly rebased. | ||||
| """ | """ | ||||
| childrenof = common.getchildrelationships(repo, | childrenof = common.getchildrelationships(repo, | ||||
| repo.revs('%d + allprecursors(%d)', base, base)) | repo.revs('%d + allpredecessors(%d)', base, base)) | ||||
| # Perform BFS starting from base. | # Perform BFS starting from base. | ||||
| queue = deque([base]) | queue = deque([base]) | ||||
| targets = [] | targets = [] | ||||
| processed = set() | processed = set() | ||||
| while queue: | while queue: | ||||
| rev = queue.popleft() | rev = queue.popleft() | ||||
| # descendants of their precursors rebased before older children. | # descendants of their precursors rebased before older children. | ||||
| # This ensures that unstable changesets will always be rebased | # This ensures that unstable changesets will always be rebased | ||||
| # onto the latest visible successor of their parent changeset. | # onto the latest visible successor of their parent changeset. | ||||
| queue.extend(sorted(childrenof[rev])) | queue.extend(sorted(childrenof[rev])) | ||||
| # Look for visible precursors (which are probably visible because | # Look for visible precursors (which are probably visible because | ||||
| # they have unstable descendants) and successors (for which the latest | # they have unstable descendants) and successors (for which the latest | ||||
| # non-obsolete version should be visible). | # non-obsolete version should be visible). | ||||
| precursors = repo.revs('allprecursors(%d)', rev) | precursors = repo.revs('allpredecessors(%d)', rev) | ||||
| successors = repo.revs('allsuccessors(%d)', rev) | successors = repo.revs('allsuccessors(%d)', rev) | ||||
| # If this changeset has precursors but no successor, then | # If this changeset has precursors but no successor, then | ||||
| # if its precursors have children those children need to be | # if its precursors have children those children need to be | ||||
| # rebased onto the changeset. | # rebased onto the changeset. | ||||
| if precursors and not successors: | if precursors and not successors: | ||||
| children = [] | children = [] | ||||
| for p in precursors: | for p in precursors: | ||||