diff --git a/hgext3rd/fbamend/common.py b/hgext3rd/fbamend/common.py --- a/hgext3rd/fbamend/common.py +++ b/hgext3rd/fbamend/common.py @@ -43,10 +43,10 @@ """ # Get visible descendants of precusors of rev. # Excluding obsoleted changesets avoids divergence issues. - allprecursors = repo.revs('allprecursors(%d)', rev) + allpredecessors = repo.revs('allpredecessors(%d)', rev) fmt = ('%s(%%ld) - %%ld - obsolete()' % ('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. if not descendants: diff --git a/hgext3rd/fbamend/restack.py b/hgext3rd/fbamend/restack.py --- a/hgext3rd/fbamend/restack.py +++ b/hgext3rd/fbamend/restack.py @@ -67,7 +67,7 @@ to be correctly rebased. """ childrenof = common.getchildrelationships(repo, - repo.revs('%d + allprecursors(%d)', base, base)) + repo.revs('%d + allpredecessors(%d)', base, base)) # Perform BFS starting from base. queue = deque([base]) @@ -93,7 +93,7 @@ # Look for visible precursors (which are probably visible because # they have unstable descendants) and successors (for which the latest # non-obsolete version should be visible). - precursors = repo.revs('allprecursors(%d)', rev) + precursors = repo.revs('allpredecessors(%d)', rev) successors = repo.revs('allsuccessors(%d)', rev) # If this changeset has precursors but no successor, then