( )⚙ D388 filemerge: extract _maketemp and _makebackup

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: extract _maketemp and _makebackup
ClosedPublic

Authored by phillco on Aug 14 2017, 4:57 PM.

Details

Summary

These functions will be modified by in-memory merge, so let's extract them first and add some comments.

This also shortens _filemerge a bit.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 14 2017, 4:57 PM
phillco edited the summary of this revision. (Show Details)Aug 14 2017, 4:58 PM
phillco edited the summary of this revision. (Show Details)
phillco updated this revision to Diff 1221.Aug 23 2017, 3:37 PM
phillco updated this revision to Diff 1302.Aug 25 2017, 4:56 PM
phillco updated this revision to Diff 1453.Aug 30 2017, 5:12 PM
martinvonz added inline comments.
mercurial/filemerge.py
604–606

Some words missing and/or too many in here

phillco updated this revision to Diff 1477.Aug 31 2017, 1:57 PM
phillco marked an inline comment as done.Aug 31 2017, 1:57 PM
phillco updated this revision to Diff 1485.Aug 31 2017, 2:29 PM

(Fixed trailing space)

In D388#9515, @phillco wrote:

(Fixed trailing space)

Yep, I saw that in tests and fixed it locally, so you'll probably see divergence when you pull after I've pushed them.

phillco updated this revision to Diff 1507.Aug 31 2017, 4:15 PM
This revision was automatically updated to reflect the committed changes.
singhsrb updated this revision to Diff 1624.Sep 5 2017, 8:38 PM