| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
The stack stops applying here. I've queued the previous changes, but this appears to not have been rebased.
In D11901#183188, @Alphare wrote:The stack stops applying here. I've queued the previous changes, but this appears to not have been rebased.
Done.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/simplemerge.py (40 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| lines.extend(b_lines) | lines.extend(b_lines) | ||||
| lines.append(b">>>>>>>\n") | lines.append(b">>>>>>>\n") | ||||
| conflicts = True | conflicts = True | ||||
| else: | else: | ||||
| lines.extend(group[1]) | lines.extend(group[1]) | ||||
| return lines, conflicts | return lines, conflicts | ||||
| def _resolve(m3, sides): | |||||
| lines = [] | |||||
| for group in m3.merge_groups(): | |||||
| if group[0] == b'conflict': | |||||
| for side in sides: | |||||
| lines.extend(group[side + 1]) | |||||
| else: | |||||
| lines.extend(group[1]) | |||||
| return lines | |||||
| def simplemerge(ui, localctx, basectx, otherctx, **opts): | def simplemerge(ui, localctx, basectx, otherctx, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| The merged result is written into `localctx`. | The merged result is written into `localctx`. | ||||
| """ | """ | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| # Merges were always run in the working copy before, which means | # Merges were always run in the working copy before, which means | ||||
| try: | try: | ||||
| localtext = readctx(localctx) | localtext = readctx(localctx) | ||||
| basetext = readctx(basectx) | basetext = readctx(basectx) | ||||
| othertext = readctx(otherctx) | othertext = readctx(otherctx) | ||||
| except error.Abort: | except error.Abort: | ||||
| return 1 | return 1 | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| extrakwargs = { | conflicts = False | ||||
| "localorother": None, | |||||
| 'minimize': True, | |||||
| } | |||||
| if mode == b'union': | if mode == b'union': | ||||
| extrakwargs['start_marker'] = None | lines = _resolve(m3, (1, 2)) | ||||
| extrakwargs['mid_marker'] = None | |||||
| extrakwargs['end_marker'] = None | |||||
| elif mode == b'local': | elif mode == b'local': | ||||
| extrakwargs['localorother'] = b'local' | lines = _resolve(m3, (1,)) | ||||
| elif mode == b'other': | elif mode == b'other': | ||||
| extrakwargs['localorother'] = b'other' | lines = _resolve(m3, (2,)) | ||||
| elif name_base is not None: | elif mode == b'mergediff': | ||||
| lines, conflicts = _mergediff(m3, name_a, name_b, name_base) | |||||
| else: | |||||
| extrakwargs = { | |||||
| 'minimize': True, | |||||
| } | |||||
| if name_base is not None: | |||||
| extrakwargs['base_marker'] = b'|||||||' | extrakwargs['base_marker'] = b'|||||||' | ||||
| extrakwargs['name_base'] = name_base | extrakwargs['name_base'] = name_base | ||||
| extrakwargs['minimize'] = False | extrakwargs['minimize'] = False | ||||
| if mode == b'mergediff': | |||||
| lines, conflicts = _mergediff(m3, name_a, name_b, name_base) | |||||
| else: | |||||
| lines = list( | lines = list( | ||||
| m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) | m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) | ||||
| ) | ) | ||||
| conflicts = m3.conflicts and not mode == b'union' | conflicts = m3.conflicts | ||||
| mergedtext = b''.join(lines) | mergedtext = b''.join(lines) | ||||
| if opts.get('print'): | if opts.get('print'): | ||||
| ui.fout.write(mergedtext) | ui.fout.write(mergedtext) | ||||
| else: | else: | ||||
| # localctx.flags() already has the merged flags (done in | # localctx.flags() already has the merged flags (done in | ||||
| # mergestate.resolve()) | # mergestate.resolve()) | ||||
| localctx.write(mergedtext, localctx.flags()) | localctx.write(mergedtext, localctx.flags()) | ||||
| if conflicts: | if conflicts: | ||||
| return 1 | return 1 | ||||