[Commented On] D12356: filemerge: add support for partial conflict resolution by external tool

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> Alphare wrote in filemerge.py:1131
> This should be gated by the presence of patterns so as to not create and run a `match` every time if there are no patterns

I'm not sure that will make a significant difference, but it's also not much more code to check it, so I've made the change.

(There's no "every time" here. It would be nice to read the config etc. only once per merge, or even once per command, but `filemerge.filemerge()` is called once per file. We could refactor it to pass some object containing matchers etc. into `filemerge`, but I'd rather leave that for later, once we've seen if it's even a problem.)

> Alphare wrote in test-merge-partial-tool.t:47
> Please use `hg up` or `hg update` instead. I'm not the only one who's lost time in other places in the codebase due to thinking this was somehow `commit`. :)

Interesting, I don't think I'd heard that complaint before. That's good to know.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12356/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12356

To: martinvonz, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220314/6874b473/attachment-0002.html>