This is an archive of the discontinued Mercurial Phabricator instance.

Differential D399

filemerge: eliminate most uses of tempfiles
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG67cfffbfb6a0: filemerge: eliminate most uses of tempfiles
Summary

Emphasize that they're unused so we can more easily remove them later.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 15 2017, 1:28 AM
lothiraldan added a subscriber: lothiraldan.Aug 16 2017, 4:32 AM

Small typo in the commit message: s/remobe/remove

phillco edited the summary of this revision. (Show Details)Aug 16 2017, 2:22 PM

Fixed, thanks @lothiraldan :)

phillco edited the summary of this revision. (Show Details)Aug 23 2017, 3:38 PM
phillco updated this revision to Diff 1222.
phillco updated this revision to Diff 1304.Aug 25 2017, 5:01 PM
phillco updated this revision to Diff 1454.Aug 30 2017, 5:12 PM
phillco updated this revision to Diff 1479.Aug 31 2017, 2:00 PM
phillco updated this revision to Diff 1486.Aug 31 2017, 2:29 PM
martinvonz added a subscriber: martinvonz.Aug 31 2017, 3:47 PM

Seems like you missed two places. Let me know if should fix them in flight

mercurial/filemerge.py
425–426

why not change here too?

471

and "b, c, back" seem unused here

phillco added a comment.EditedAug 31 2017, 3:52 PM

Feel free to, otherwise I can. Thanks.

phillco edited the summary of this revision. (Show Details)Aug 31 2017, 3:52 PM
martinvonz added a comment.Aug 31 2017, 3:56 PM
In D399#9522, @phillco wrote:

Feel free to, otherwise I can. Thanks.

Done.

phillco edited the summary of this revision. (Show Details)Aug 31 2017, 4:15 PM
phillco updated this revision to Diff 1508.
Closed by commit rHG67cfffbfb6a0: filemerge: eliminate most uses of tempfiles (authored by phillco). · Explain WhyAug 31 2017, 5:22 PM
This revision was automatically updated to reflect the committed changes.
singhsrb edited the summary of this revision. (Show Details)Sep 5 2017, 8:38 PM
singhsrb updated this revision to Diff 1625.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (12 lines)

Diff 1625

mercurial/filemerge.py

return filectx.changectx()[filectx.path()] return filectx.changectx()[filectx.path()]
else: else:
return filectx return filectx
def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
if symlink or fcd.isabsent() or fco.isabsent(): if symlink or fcd.isabsent() or fco.isabsent():
return 1 return 1
a, b, c, back = files unused, unused, unused, back = files
ui = repo.ui ui = repo.ui
validkeep = ['keep', 'keep-merge3'] validkeep = ['keep', 'keep-merge3']
# do we attempt to simplemerge first? # do we attempt to simplemerge first?
try: try:
premerge = _toolbool(ui, tool, "premerge", not binary) premerge = _toolbool(ui, tool, "premerge", not binary)
if len(labels) < 3: if len(labels) < 3:
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:
util.copyfile(back, a) # restore from backup and try again # restore from backup and try again
util.copyfile(back, repo.wjoin(fcd.path()))
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
if fcd.isabsent() or fco.isabsent(): if fcd.isabsent() or fco.isabsent():
repo.ui.warn(_('warning: internal %s cannot merge change/delete ' repo.ui.warn(_('warning: internal %s cannot merge change/delete '
'conflict for %s\n') % (tool, fcd.path())) 'conflict for %s\n') % (tool, fcd.path()))
return False return False
return True return True
def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in files. It will fail if there are any conflicts and leave markers in
the partially merged file. Markers will have two sections, one for each side the partially merged file. Markers will have two sections, one for each side
of merge, unless mode equals 'union' which suppresses the markers.""" of merge, unless mode equals 'union' which suppresses the markers."""
a, b, c, back = files
ui = repo.ui ui = repo.ui
r = simplemerge.simplemerge(ui, fcd, fca, fco, r = simplemerge.simplemerge(ui, fcd, fca, fco,
label=labels, mode=mode, repo=repo) label=labels, mode=mode, repo=repo)
return True, r, False return True, r, False
@internaltool('union', fullmerge, @internaltool('union', fullmerge,
_("warning: conflicts while merging %s! " _("warning: conflicts while merging %s! "
return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=None, localorother=None): labels=None, localorother=None):
""" """
Generic driver for _imergelocal and _imergeother Generic driver for _imergelocal and _imergeother
""" """
assert localorother is not None assert localorother is not None
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
a, b, c, back = files
r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
martinvonzUnsubmitted
Not Done

why not change here too?

martinvonz: why not change here too?
label=labels, localorother=localorother, label=labels, localorother=localorother,
repo=repo) repo=repo)
return True, r return True, r
@internaltool('merge-local', mergeonly, precheck=_mergecheck) @internaltool('merge-local', mergeonly, precheck=_mergecheck)
def _imergelocal(*args, **kwargs): def _imergelocal(*args, **kwargs):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
perform a merge manually. If the file to be merged is named perform a merge manually. If the file to be merged is named
``a.txt``, these files will accordingly be named ``a.txt.local``, ``a.txt``, these files will accordingly be named ``a.txt.local``,
``a.txt.other`` and ``a.txt.base`` and they will be placed in the ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
same directory as ``a.txt``. same directory as ``a.txt``.
This implies permerge. Therefore, files aren't dumped, if premerge This implies permerge. Therefore, files aren't dumped, if premerge
runs successfully. Use :forcedump to forcibly write files out. runs successfully. Use :forcedump to forcibly write files out.
""" """
a, b, c, back = files a, unused, unused, unused = files
martinvonzUnsubmitted
Not Done

and "b, c, back" seem unused here

martinvonz: and "b, c, back" seem unused here
fd = fcd.path() fd = fcd.path()
util.copyfile(a, a + ".local") util.copyfile(a, a + ".local")
repo.wwrite(fd + ".other", fco.data(), fco.flags()) repo.wwrite(fd + ".other", fco.data(), fco.flags())
repo.wwrite(fd + ".base", fca.data(), fca.flags()) repo.wwrite(fd + ".base", fca.data(), fca.flags())
return False, 1, False return False, 1, False
finally: finally:
if not r and back is not None: if not r and back is not None:
util.unlink(back) util.unlink(back)
util.unlink(files[1]) util.unlink(files[1])
util.unlink(files[2]) util.unlink(files[2])
def _check(r, ui, tool, fcd, files): def _check(r, ui, tool, fcd, files):
fd = fcd.path() fd = fcd.path()
a, b, c, back = files a, unused, unused, back = files
if not r and (_toolbool(ui, tool, "checkconflicts") or if not r and (_toolbool(ui, tool, "checkconflicts") or
'conflicts' in _toollist(ui, tool, "check")): 'conflicts' in _toollist(ui, tool, "check")):
if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
re.MULTILINE): re.MULTILINE):
r = 1 r = 1
checked = False checked = False