| hg-reviewers |
This eliminates the need for the repo object.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| f = open(filename, "rb") | f = open(filename, "rb") | ||||
| text = f.read() | text = f.read() | ||||
| f.close() | f.close() | ||||
| return _verifytext(text, filename, ui, opts) | return _verifytext(text, filename, ui, opts) | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| if not ctx: | if not ctx: | ||||
| return None | return None | ||||
| if not repo: | # Merges were always run in the working copy before, which means | ||||
| raise error.ProgrammingError('simplemerge: repo must be passed if ' | # they used decoded data, if the user defined any repository | ||||
| 'using contexts') | # filters. | ||||
| # `wwritedata` is used to get the post-filter data from `ctx` (i.e., | # | ||||
| # what would have been in the working copy). Since merges were run in | # Maintain that behavior today for BC, though perhaps in the future | ||||
| # the working copy, and thus used post-filter data, we do the same to | # it'd be worth considering whether merging encoded data (what the | ||||
| # maintain behavior. | # repository usually sees) might be more useful. | ||||
| return repo.wwritedata(ctx.path(), | return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) | ||||
| _verifytext(ctx.data(), ctx.path(), ui, opts)) | |||||
| class ctxwriter(object): | class ctxwriter(object): | ||||
| def __init__(self, ctx): | def __init__(self, ctx): | ||||
| self.ctx = ctx | self.ctx = ctx | ||||
| self.text = "" | self.text = "" | ||||
| def write(self, text): | def write(self, text): | ||||
| self.text += text | self.text += text | ||||