D617: filemerge: use fctx.write() in the internal:dump tool, instead of copy

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Tue Sep 5 11:51:56 EDT 2017


martinvonz added inline comments.

INLINE COMMENTS

> filemerge.py:471
>  
> -    util.copyfile(a, a + ".local")
> +    util.writefile(a + ".local", repo.wwritedata(fcd.path(), fcd.data()))
>      repo.wwrite(fd + ".other", fco.data(), fco.flags())

Wasn't this what decodeddata() was for? I.e., something like

  util.writefile(a + ".local", fcd.decoded())

REPOSITORY
  rHG Mercurial

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

To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list