( )⚙ D400 filemerge: move a util copy call to filectx.write

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D400

filemerge: move a util copy call to filectx.write
ClosedPublic

Authored by phillco on Aug 15 2017, 1:28 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd37f1bb68169: filemerge: move a util copy call to filectx.write
Summary

This way a future in-memory-merge context can intercept them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 15 2017, 1:28 AM
phillco updated this revision to Diff 1218.Aug 23 2017, 3:37 PM
phillco updated this revision to Diff 1305.Aug 25 2017, 5:01 PM
phillco updated this revision to Diff 1455.Aug 30 2017, 5:12 PM
phillco updated this revision to Diff 1480.Aug 31 2017, 2:00 PM
phillco updated this revision to Diff 1487.Aug 31 2017, 2:30 PM
phillco updated this revision to Diff 1502.Aug 31 2017, 3:44 PM
phillco updated this revision to Diff 1509.Aug 31 2017, 4:15 PM
Closed by commit rHGd37f1bb68169: filemerge: move a util copy call to filectx.write (authored by phillco). · Explain WhyAug 31 2017, 5:22 PM
This revision was automatically updated to reflect the committed changes.
singhsrb updated this revision to Diff 1626.Sep 5 2017, 8:38 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (4 lines)

Diff 1218

mercurial/filemerge.py

labels.append('base') labels.append('base')
r = simplemerge.simplemerge(ui, fcd, fca, fco, r = simplemerge.simplemerge(ui, fcd, fca, fco,
quiet=True, label=labels, repo=repo) quiet=True, label=labels, repo=repo)
if not r: if not r:
ui.debug(" premerge successful\n") ui.debug(" premerge successful\n")
return 0 return 0
if premerge not in validkeep: if premerge not in validkeep:
# restore from backup and try again # restore from backup and try again
util.copyfile(back, repo.wjoin(fcd.path())) # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead.
fcd.write(util.readfile(back), fcd.flags())
return 1 # continue merging return 1 # continue merging
def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
if symlink: if symlink:
repo.ui.warn(_('warning: internal %s cannot merge symlinks ' repo.ui.warn(_('warning: internal %s cannot merge symlinks '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False return False