Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.py @ 46429:98e3a693061a
simplemerge: delete unused find_unconflicted()
The function has been unused ever since it was introduced in
465b9ea02868 (Import 3-way merge code from bzr, 2007-04-16).
Differential Revision: https://phab.mercurial-scm.org/D9832
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 18 Jan 2021 22:32:09 -0800 |
| parents | 59fa3890d40a |
| children | 728d89f6f9b1 |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Fri Dec 04 10:11:01 2020 +0100 +++ b/mercurial/simplemerge.py Mon Jan 18 22:32:09 2021 -0800 @@ -402,31 +402,6 @@ return sl - def find_unconflicted(self): - """Return a list of ranges in base that are not conflicted.""" - am = mdiff.get_matching_blocks(self.basetext, self.atext) - bm = mdiff.get_matching_blocks(self.basetext, self.btext) - - unc = [] - - while am and bm: - # there is an unconflicted block at i; how long does it - # extend? until whichever one ends earlier. - a1 = am[0][0] - a2 = a1 + am[0][2] - b1 = bm[0][0] - b2 = b1 + bm[0][2] - i = intersect((a1, a2), (b1, b2)) - if i: - unc.append(i) - - if a2 < b2: - del am[0] - else: - del bm[0] - - return unc - def _verifytext(text, path, ui, opts): """verifies that text is non-binary (unless opts[text] is passed,