This is an archive of the discontinued Mercurial Phabricator instance.

Differential D404

filemerge: add _restorebackup
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfe04c018eaac: filemerge: add _restorebackup
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Aug 15 2017, 1:52 AM
phillco updated this revision to Diff 1225.Aug 23 2017, 3:38 PM
phillco updated this revision to Diff 1308.Aug 25 2017, 5:01 PM
phillco updated this revision to Diff 1312.Aug 25 2017, 6:12 PM
phillco updated this revision to Diff 1458.Aug 30 2017, 5:12 PM
phillco updated this revision to Diff 1483.Aug 31 2017, 2:00 PM
phillco updated this revision to Diff 1490.Aug 31 2017, 2:30 PM
phillco updated this revision to Diff 1505.Aug 31 2017, 3:45 PM
Closed by commit rHGfe04c018eaac: filemerge: add _restorebackup (authored by phillco). · Explain WhyAug 31 2017, 5:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (9 lines)

Diff 1515

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
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use _restorebackup(fcd, back)
# 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
"o": "", "o": "",
} }
return { return {
"l": " [%s]" % labels[0], "l": " [%s]" % labels[0],
"o": " [%s]" % labels[1], "o": " [%s]" % labels[1],
} }
def _restorebackup(fcd, back):
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead.
fcd.write(util.readfile(back), fcd.flags())
def _makebackup(repo, ui, fcd, premerge): def _makebackup(repo, ui, fcd, premerge):
"""Makes a backup of the local `fcd` file prior to merging. """Makes a backup of the local `fcd` file prior to merging.
In addition to preserving the user's pre-existing modifications to `fcd` In addition to preserving the user's pre-existing modifications to `fcd`
(if any), the backup is used to undo certain premerges, confirm whether a (if any), the backup is used to undo certain premerges, confirm whether a
merge changed anything, and determine what line endings the new file should merge changed anything, and determine what line endings the new file should
have. have.
""" """