This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: use contexts to read file data from, if passed
ClosedPublic

Authored by phillco on Aug 14 2017, 2:15 AM.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 14 2017, 2:15 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.
mercurial/simplemerge.py
425

leftovers? doesn't seem to happen because you guard against it on lines 457-459

430

What is this "post-filter data"? I didn't know hg had this feature. Something like git' clean/smudge filters?

phillco added inline comments.Aug 19 2017, 1:52 PM
mercurial/simplemerge.py
430

Yeah, exactly. I didn't know about it either. https://www.mercurial-scm.org/wiki/EncodeDecodeFilter?highlight=%28filter%29

Perhaps including that link in the comment, or in wwritedata (later, decodeddata()) might be a good idea.