Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 48558:2dbee604a4f0
simplemerge: clarify names of functions that render conflict markers
Differential Revision: https://phab.mercurial-scm.org/D11975
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 11 Jan 2022 16:54:42 -0800 |
| parents | c6649c53073f |
| children | 12ac4401ff7d |
comparison
equal
deleted
inserted
replaced
| 48557:c6649c53073f | 48558:2dbee604a4f0 |
|---|---|
| 270 pa = p1.ancestor(p2) | 270 pa = p1.ancestor(p2) |
| 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 = [l.strip() for l in simplemerge.merge_lines(m3)[0]] | 275 ml = [ |
| 276 l.strip() for l in simplemerge.render_markers(m3)[0] | |
| 277 ] | |
| 276 ml.append(b"") | 278 ml.append(b"") |
| 277 elif at > 0: | 279 elif at > 0: |
| 278 ml = p1[fn].data().split(b"\n") | 280 ml = p1[fn].data().split(b"\n") |
| 279 else: | 281 else: |
| 280 ml = initialmergedlines | 282 ml = initialmergedlines |