| Alphare |
| hg-reviewers |
The simplemerge module does too much UI-related things. This patch
puts a specialized copy of simplemerge._verifytext() in the
simplemerge extension.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/simplemerge.py (30 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 2712ec5d9aa4 | adfd73ea3f5c | Martin von Zweigbergk | Feb 5 2022, 2:43 AM |
| 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 | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| lines.extend(group_lines) | lines.extend(group_lines) | ||||
| return lines | return lines | ||||
| class MergeInput(object): | class MergeInput(object): | ||||
| def __init__(self, fctx, label=None, label_detail=None): | def __init__(self, fctx, label=None, label_detail=None): | ||||
| self.fctx = fctx | self.fctx = fctx | ||||
| self.label = label | self.label = label | ||||
| self._text = None | |||||
| # If the "detail" part is set, then that is rendered after the label and | # If the "detail" part is set, then that is rendered after the label and | ||||
| # separated by a ':'. The label is padded to make the ':' aligned among | # separated by a ':'. The label is padded to make the ':' aligned among | ||||
| # all merge inputs. | # all merge inputs. | ||||
| self.label_detail = label_detail | self.label_detail = label_detail | ||||
| def _verifytext(self, ui, opts): | def text(self): | ||||
| """verifies that text is non-binary (unless opts[text] is passed, | if self._text is None: | ||||
| then we just warn)""" | |||||
| # Merges were always run in the working copy before, which means | # Merges were always run in the working copy before, which means | ||||
| # they used decoded data, if the user defined any repository | # they used decoded data, if the user defined any repository | ||||
| # filters. | # filters. | ||||
| # | # | ||||
| # Maintain that behavior today for BC, though perhaps in the future | # Maintain that behavior today for BC, though perhaps in the future | ||||
| # it'd be worth considering whether merging encoded data (what the | # it'd be worth considering whether merging encoded data (what the | ||||
| # repository usually sees) might be more useful. | # repository usually sees) might be more useful. | ||||
| text = self.fctx.decodeddata() | self._text = self.fctx.decodeddata() | ||||
| return self._text | |||||
| def verifytext(self, ui, **opts): | |||||
| """verifies that text is non-binary (unless opts[text] is passed, | |||||
| then we just warn)""" | |||||
| text = self.text() | |||||
| if stringutil.binary(text): | if stringutil.binary(text): | ||||
| msg = _(b"%s looks like a binary file.") % self.fctx.path() | msg = _(b"%s looks like a binary file.") % self.fctx.path() | ||||
| if not opts.get('quiet'): | if not opts.get('quiet'): | ||||
| ui.warn(_(b'warning: %s\n') % msg) | ui.warn(_(b'warning: %s\n') % msg) | ||||
| if not opts.get('text'): | if not opts.get('text'): | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| return text | return text | ||||
| def simplemerge(ui, local, base, other, **opts): | def simplemerge(ui, local, base, other, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| The merged result is written into `localctx`. | The merged result is written into `localctx`. | ||||
| """ | """ | ||||
| try: | try: | ||||
| localtext = local._verifytext(ui, opts) | localtext = local.verifytext(ui, **opts) | ||||
| basetext = base._verifytext(ui, opts) | basetext = base.verifytext(ui, **opts) | ||||
| othertext = other._verifytext(ui, opts) | othertext = other.verifytext(ui, **opts) | ||||
| except error.Abort: | except error.Abort: | ||||
| return True | return True | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| conflicts = False | conflicts = False | ||||
| mode = opts.get('mode', b'merge') | mode = opts.get('mode', b'merge') | ||||
| if mode == b'union': | if mode == b'union': | ||||
| lines = _resolve(m3, (1, 2)) | lines = _resolve(m3, (1, 2)) | ||||