Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/debugcommands.py @ 48590:12ac4401ff7d
simplemerge: simplify and rename `render_markers()`
`render_markers()` now always renders minimized 2-way markers, so
let's simplify and rename it accordingly.
Differential Revision: https://phab.mercurial-scm.org/D11979
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 11 Jan 2022 21:56:27 -0800 |
| parents | 2dbee604a4f0 |
| children | b4bc9c4f925d |
comparison
equal
deleted
inserted
replaced
| 48589:69e76b2aad3d | 48590:12ac4401ff7d |
|---|---|
| 271 base, local, other = [ | 271 base, local, other = [ |
| 272 x[fn].data() for x in (pa, p1, p2) | 272 x[fn].data() for x in (pa, p1, p2) |
| 273 ] | 273 ] |
| 274 m3 = simplemerge.Merge3Text(base, local, other) | 274 m3 = simplemerge.Merge3Text(base, local, other) |
| 275 ml = [ | 275 ml = [ |
| 276 l.strip() for l in simplemerge.render_markers(m3)[0] | 276 l.strip() |
| 277 for l in simplemerge.render_minimized(m3)[0] | |
| 277 ] | 278 ] |
| 278 ml.append(b"") | 279 ml.append(b"") |
| 279 elif at > 0: | 280 elif at > 0: |
| 280 ml = p1[fn].data().split(b"\n") | 281 ml = p1[fn].data().split(b"\n") |
| 281 else: | 282 else: |