Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 16867:1093ad1e8903
revlog: descendants(*revs) becomes descendants(revs) (API)
Once again making the API more rational, as with ancestors.
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Fri, 01 Jun 2012 12:45:16 -0700 |
| parents | 91f3ac205816 |
| children | 50f434510da6 6c05eebd9fab |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Jun 01 12:37:18 2012 -0700 +++ b/hgext/rebase.py Fri Jun 01 12:45:16 2012 -0700 @@ -321,7 +321,7 @@ # Remove no more useful revisions rebased = [rev for rev in state if state[rev] != nullmerge] if rebased: - if set(repo.changelog.descendants(min(rebased))) - set(state): + if set(repo.changelog.descendants([min(rebased)])) - set(state): ui.warn(_("warning: new changesets detected " "on source branch, not stripping\n")) else: @@ -575,7 +575,7 @@ descendants = set() if dstates: - descendants = set(repo.changelog.descendants(*dstates)) + descendants = set(repo.changelog.descendants(dstates)) if descendants - set(dstates): repo.ui.warn(_("warning: new changesets detected on target branch, " "can't abort\n"))