equal
deleted
inserted
replaced
143 def _find_new_divergence(repo, revs): |
143 def _find_new_divergence(repo, revs): |
144 obsrevs = repo.revs(b'%ld and obsolete()', revs) |
144 obsrevs = repo.revs(b'%ld and obsolete()', revs) |
145 for r in obsrevs: |
145 for r in obsrevs: |
146 div = find_new_divergence_from(repo, repo[r]) |
146 div = find_new_divergence_from(repo, repo[r]) |
147 if div: |
147 if div: |
148 return (repo[r], repo[div[0]], repo[div[1]]) |
148 return (repo[r], repo[div[0]], repo.unfiltered()[div[1]]) |
149 return None |
149 return None |
150 |
150 |
151 |
151 |
152 def find_new_divergence_from(repo, ctx): |
152 def find_new_divergence_from(repo, ctx): |
153 """return divergent revision if rewriting an obsolete cset (ctx) will |
153 """return divergent revision if rewriting an obsolete cset (ctx) will |