| Alphare |
| hg-reviewers |
I want to be able to update the file contents for support for partial
conflict resolution. Having the text available (and later settable) on
MergeInput will enable that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/simplemerge.py (32 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 | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| 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 | ||||
| # 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 | ||||
| self._text = None | |||||
| def text(self): | |||||
| if self._text is None: | |||||
| # Merges were always run in the working copy before, which means | |||||
| # they used decoded data, if the user defined any repository | |||||
| # filters. | |||||
| # | |||||
| # Maintain that behavior today for BC, though perhaps in the future | |||||
| # it'd be worth considering whether merging encoded data (what the | |||||
| # repository usually sees) might be more useful. | |||||
| self._text = self.fctx.decodeddata() | |||||
| return self._text | |||||
| def simplemerge( | def simplemerge( | ||||
| ui, | ui, | ||||
| local, | local, | ||||
| base, | base, | ||||
| other, | other, | ||||
| mode=b'merge', | mode=b'merge', | ||||
| quiet=False, | quiet=False, | ||||
| allow_binary=False, | allow_binary=False, | ||||
| print_result=False, | print_result=False, | ||||
| ): | ): | ||||
| """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(input): | ||||
| # Merges were always run in the working copy before, which means | |||||
| # they used decoded data, if the user defined any repository | |||||
| # filters. | |||||
| # | |||||
| # Maintain that behavior today for BC, though perhaps in the future | |||||
| # it'd be worth considering whether merging encoded data (what the | |||||
| # repository usually sees) might be more useful. | |||||
| return _verifytext( | return _verifytext( | ||||
| ctx.decodeddata(), | input.text(), | ||||
| ctx.path(), | input.fctx.path(), | ||||
| ui, | ui, | ||||
| quiet=quiet, | quiet=quiet, | ||||
| allow_binary=allow_binary, | allow_binary=allow_binary, | ||||
| ) | ) | ||||
| try: | try: | ||||
| localtext = readctx(local.fctx) | localtext = readctx(local) | ||||
| basetext = readctx(base.fctx) | basetext = readctx(base) | ||||
| othertext = readctx(other.fctx) | othertext = readctx(other) | ||||
| except error.Abort: | except error.Abort: | ||||
| return True | return True | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| conflicts = False | conflicts = False | ||||
| if mode == b'union': | if mode == b'union': | ||||
| lines = _resolve(m3, (1, 2)) | lines = _resolve(m3, (1, 2)) | ||||
| elif mode == b'local': | elif mode == b'local': | ||||