equal
deleted
inserted
replaced
137 in which case return (False, '.') |
137 in which case return (False, '.') |
138 """ |
138 """ |
139 targets = obsutil.successorssets(repo, ctx.node())[0] |
139 targets = obsutil.successorssets(repo, ctx.node())[0] |
140 assert targets |
140 assert targets |
141 targetrevs = [repo[r].rev() for r in targets] |
141 targetrevs = [repo[r].rev() for r in targets] |
142 roots = repo.revs(b'roots(%ld::%ld)', targetrevs, targetrevs) |
|
143 heads = repo.revs(b'heads(%ld::%ld)', targetrevs, targetrevs) |
142 heads = repo.revs(b'heads(%ld::%ld)', targetrevs, targetrevs) |
144 if len(roots) > 1 or len(heads) > 1: |
143 if len(heads) > 1: |
145 cheader = (_(b"ancestor of '%s' split over multiple topological" |
144 cheader = (_(b"ancestor of '%s' split over multiple topological" |
146 b" branches.\nchoose an evolve destination:") % |
145 b" branches.\nchoose an evolve destination:") % |
147 evolvecand) |
146 evolvecand) |
148 selectedrev = revselectionprompt(ui, repo, list(heads), cheader) |
147 selectedrev = revselectionprompt(ui, repo, list(heads), cheader) |
149 if selectedrev is None: |
148 if selectedrev is None: |