This is an archive of the discontinued Mercurial Phabricator instance.

Differential D401

filemerge: add `_workingpath`
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7558917f291e: filemerge: add `_workingpath`
Summary

This reduces any reliance on a.

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 edited the summary of this revision. (Show Details)Aug 15 2017, 1:29 AM
phillco edited the summary of this revision. (Show Details)Aug 15 2017, 1:33 AM
phillco retitled this revision from filemerge: reduce creation of tempfiles until needed to filemerge: add `_workingpath`.
phillco updated this revision to Diff 910.
phillco updated this revision to Diff 911.Aug 15 2017, 1:40 AM
phillco updated this revision to Diff 1223.Aug 23 2017, 3:38 PM
phillco updated this revision to Diff 1306.Aug 25 2017, 5:01 PM
phillco updated this revision to Diff 1310.Aug 25 2017, 6:10 PM
phillco updated this revision to Diff 1456.Aug 30 2017, 5:12 PM
martinvonz added a subscriber: martinvonz.Aug 31 2017, 3:11 AM
martinvonz added inline comments.
mercurial/filemerge.py
736

should "a" be renamed to "unused" here?

phillco abandoned this revision.Aug 31 2017, 3:35 AM
phillco added inline comments.
mercurial/filemerge.py
736

you're right. I'll make that change in the morning.

phillco updated this revision to Diff 1481.Aug 31 2017, 2:00 PM
phillco updated this revision to Diff 1488.Aug 31 2017, 2:30 PM
martinvonz added inline comments.Aug 31 2017, 3:43 PM
mercurial/filemerge.py
736

It's now past morning (in our timezone) :-) But don't worry, I'll fix this in flight.

phillco updated this revision to Diff 1503.Aug 31 2017, 3:45 PM
Closed by commit rHG7558917f291e: filemerge: add `_workingpath` (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 1627.Sep 5 2017, 8:38 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (20 lines)

Diff 911

mercurial/filemerge.py

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 unused, unused, unused, unused = files
a = _workingpath(repo, fcd)
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
@internaltool('forcedump', mergeonly) @internaltool('forcedump', mergeonly)
def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=None): labels=None):
""" """
Creates three versions of the files as same as :dump, but omits premerge. Creates three versions of the files as same as :dump, but omits premerge.
""" """
return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=labels) labels=labels)
def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
if fcd.isabsent() or fco.isabsent(): if fcd.isabsent() or fco.isabsent():
repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False, 1, None return False, 1, None
a, b, c, back = files unused, b, c, back = files
a = _workingpath(repo, fcd)
out = "" out = ""
env = {'HG_FILE': fcd.path(), env = {'HG_FILE': fcd.path(),
'HG_MY_NODE': short(mynode), 'HG_MY_NODE': short(mynode),
'HG_OTHER_NODE': str(fco.changectx()), 'HG_OTHER_NODE': str(fco.changectx()),
'HG_BASE_NODE': str(fca.changectx()), 'HG_BASE_NODE': str(fca.changectx()),
'HG_MY_ISLINK': 'l' in fcd.flags(), 'HG_MY_ISLINK': 'l' in fcd.flags(),
'HG_OTHER_ISLINK': 'l' in fco.flags(), 'HG_OTHER_ISLINK': 'l' in fco.flags(),
'HG_BASE_ISLINK': 'l' in fca.flags(), 'HG_BASE_ISLINK': 'l' in fca.flags(),
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 a premerge, confirm a merge (if any), the backup is used to undo certain a premerge, confirm a merge
changed anything, and determine what line endings the new file should have. changed anything, and determine what line endings the new file should have.
""" """
if fcd.isabsent(): if fcd.isabsent():
return None return None
a = repo.wjoin(fcd.path()) a = _workingpath(repo, fcd)
back = scmutil.origpath(ui, repo, a) back = scmutil.origpath(ui, repo, a)
if premerge: if premerge:
util.copyfile(a, back) util.copyfile(a, back)
return back return back
def _maketempfiles(repo, fcd, fco, fca): def _maketempfiles(repo, fcd, fco, fca):
"""Writes out `fco` and `fca` as temporary files, so an external merge """Writes out `fco` and `fca` as temporary files, so an external merge
tool may use them. tool may use them.
r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels) r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels)
# complete if premerge successful (r is 0) # complete if premerge successful (r is 0)
return not r, r, False return not r, r, False
needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca,
toolconf, files, labels=labels) toolconf, files, labels=labels)
if needcheck: if needcheck:
r = _check(r, ui, tool, fcd, files) r = _check(repo, r, ui, tool, fcd, files)
if r: if r:
if onfailure: if onfailure:
ui.warn(onfailure % fd) ui.warn(onfailure % fd)
return True, r, deleted return True, r, deleted
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(repo, r, ui, tool, fcd, files):
fd = fcd.path() fd = fcd.path()
a, unused, unused, back = files a, unused, unused, back = files
martinvonzUnsubmitted
Not Done

should "a" be renamed to "unused" here?

martinvonz: should "a" be renamed to "unused" here?
phillcoAuthorUnsubmitted
Not Done

you're right. I'll make that change in the morning.

phillco: you're right. I'll make that change in the morning. =
martinvonzUnsubmitted
Not Done

It's now past morning (in our timezone) :-) But don't worry, I'll fix this in flight.

martinvonz: It's now past morning (in our timezone) :-) But don't worry, I'll fix this in flight.
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
if 'prompt' in _toollist(ui, tool, "check"): if 'prompt' in _toollist(ui, tool, "check"):
checked = True checked = True
if ui.promptchoice(_("was merge of '%s' successful (yn)?" if ui.promptchoice(_("was merge of '%s' successful (yn)?"
"$$ &Yes $$ &No") % fd, 1): "$$ &Yes $$ &No") % fd, 1):
r = 1 r = 1
if not r and not checked and (_toolbool(ui, tool, "checkchanged") or if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
'changed' in 'changed' in
_toollist(ui, tool, "check")): _toollist(ui, tool, "check")):
if back is not None and filecmp.cmp(a, back): if back is not None and filecmp.cmp(_workingpath(repo, fcd), back):
if ui.promptchoice(_(" output file %s appears unchanged\n" if ui.promptchoice(_(" output file %s appears unchanged\n"
"was merge successful (yn)?" "was merge successful (yn)?"
"$$ &Yes $$ &No") % fd, 1): "$$ &Yes $$ &No") % fd, 1):
r = 1 r = 1
if back is not None and _toolbool(ui, tool, "fixeol"): if back is not None and _toolbool(ui, tool, "fixeol"):
_matcheol(a, back) _matcheol(_workingpath(repo, fcd), back)
return r return r
def _workingpath(repo, ctx):
return repo.wjoin(ctx.path())
def premerge(repo, mynode, orig, fcd, fco, fca, labels=None): def premerge(repo, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels) return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels)
def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels) return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels)
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = internals.values() i18nfunctions = internals.values()