Mercurial > evolve
changeset 3899:9a6a767bef9d stable
builddependencies: consider all divergent successors
We were only considering one. In test-evolve-abort-conentdiv.t:165,
the input revs were {5, 8} and dependency dict was {8: set([]), 5:
set([10])}, which is a little weird (10 is not in the input set). It
still worked because the callers used it (they seemed to only care if
there were *any* dependencies).
This patch fixes the issue by considering all successors. That means
the dependency dict will be {8: set([]), 5: set([8, 10])} after this
patch. The next patch will remove the 10 from that set.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 25 Jul 2018 15:16:25 -0700 |
| parents | 93d9cde93b82 |
| children | 05cb942cb9b9 |
| files | hgext3rd/evolve/utility.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/utility.py Wed Jul 25 14:00:49 2018 -0700 +++ b/hgext3rd/evolve/utility.py Wed Jul 25 15:16:25 2018 -0700 @@ -104,8 +104,9 @@ succ = _singlesuccessor(repo, p) except MultipleSuccessorsError as exc: tset = set() - for node in exc.successorssets[0]: - tset.add(repo[node].rev()) + for successorsset in exc.successorssets: + for node in successorsset: + tset.add(repo[node].rev()) dependencies[r] = tset continue if succ in revs: