| hg-reviewers |
This restricts the creation of temporary files to just _xmerge, when we call
an external tool.
| Lint Skipped |
| Unit Tests Skipped |
| 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. | ||||
| """ | """ | ||||
| unused, unused, unused, unused = files | |||||
| a = _workingpath(repo, fcd) | 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 | ||||
| unused, b, c, back = files | unused, unused, unused, back = files | ||||
| a = _workingpath(repo, fcd) | a = _workingpath(repo, fcd) | ||||
| b, c = _maketempfiles(repo, fco, fca) | |||||
| try: | |||||
| 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(), | ||||
| } | } | ||||
| ui = repo.ui | ui = repo.ui | ||||
| args = _toolstr(ui, tool, "args", '$local $base $other') | args = _toolstr(ui, tool, "args", '$local $base $other') | ||||
| if "$output" in args: | if "$output" in args: | ||||
| out, a = a, back # read input from backup, write to original | out, a = a, back # read input from backup, write to original | ||||
| replace = {'local': a, 'base': b, 'other': c, 'output': out} | replace = {'local': a, 'base': b, 'other': c, 'output': out} | ||||
| args = util.interpolate(r'\$', replace, args, | args = util.interpolate(r'\$', replace, args, | ||||
| lambda s: util.shellquote(util.localpath(s))) | lambda s: util.shellquote(util.localpath(s))) | ||||
| cmd = toolpath + ' ' + args | cmd = toolpath + ' ' + args | ||||
| if _toolbool(ui, tool, "gui"): | if _toolbool(ui, tool, "gui"): | ||||
| repo.ui.status(_('running merge tool %s for file %s\n') % | repo.ui.status(_('running merge tool %s for file %s\n') % | ||||
| (tool, fcd.path())) | (tool, fcd.path())) | ||||
| repo.ui.debug('launching merge tool: %s\n' % cmd) | repo.ui.debug('launching merge tool: %s\n' % cmd) | ||||
| r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') | r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') | ||||
| repo.ui.debug('merge tool returned: %s\n' % r) | repo.ui.debug('merge tool returned: %s\n' % r) | ||||
| return True, r, False | return True, r, False | ||||
| finally: | |||||
| util.unlink(b) | |||||
| util.unlink(c) | |||||
| def _formatconflictmarker(repo, ctx, template, label, pad): | def _formatconflictmarker(repo, ctx, template, label, pad): | ||||
| """Applies the given template to the ctx, prefixed by the label. | """Applies the given template to the ctx, prefixed by the label. | ||||
| Pad is the minimum width of the label prefix, so that multiple markers | Pad is the minimum width of the label prefix, so that multiple markers | ||||
| can have aligned templated parts. | can have aligned templated parts. | ||||
| """ | """ | ||||
| if ctx.node() is None: | if ctx.node() is None: | ||||
| return None | return None | ||||
| a = _workingpath(repo, fcd) | 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, 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. | ||||
| `fcd` is returned as-is, by convention, because it currently doubles as both | |||||
| the local version and merge destination. | |||||
| """ | """ | ||||
| def temp(prefix, ctx): | def temp(prefix, ctx): | ||||
| fullbase, ext = os.path.splitext(ctx.path()) | fullbase, ext = os.path.splitext(ctx.path()) | ||||
| pre = "%s~%s." % (os.path.basename(fullbase), prefix) | pre = "%s~%s." % (os.path.basename(fullbase), prefix) | ||||
| (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) | (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) | ||||
| data = repo.wwritedata(ctx.path(), ctx.data()) | data = repo.wwritedata(ctx.path(), ctx.data()) | ||||
| f = os.fdopen(fd, pycompat.sysstr("wb")) | f = os.fdopen(fd, pycompat.sysstr("wb")) | ||||
| f.write(data) | f.write(data) | ||||
| f.close() | f.close() | ||||
| return name | return name | ||||
| a = repo.wjoin(fcd.path()) | |||||
| b = temp("base", fca) | b = temp("base", fca) | ||||
| c = temp("other", fco) | c = temp("other", fco) | ||||
| return a, b, c | return b, c | ||||
| def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | ||||
| """perform a 3-way merge in the working directory | """perform a 3-way merge in the working directory | ||||
| premerge = whether this is a premerge | premerge = whether this is a premerge | ||||
| mynode = parent node before merge | mynode = parent node before merge | ||||
| orig = original local filename before merge | orig = original local filename before merge | ||||
| fco = other file context | fco = other file context | ||||
| if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, | ||||
| toolconf): | toolconf): | ||||
| if onfailure: | if onfailure: | ||||
| ui.warn(onfailure % fd) | ui.warn(onfailure % fd) | ||||
| return True, 1, False | return True, 1, False | ||||
| back = _makebackup(repo, ui, fcd, premerge) | back = _makebackup(repo, ui, fcd, premerge) | ||||
| files = _maketempfiles(repo, fcd, fco, fca) + (back,) | files = (None, None, None, back) | ||||
| r = 1 | r = 1 | ||||
| try: | try: | ||||
| markerstyle = ui.config('ui', 'mergemarkers') | markerstyle = ui.config('ui', 'mergemarkers') | ||||
| if not labels: | if not labels: | ||||
| labels = _defaultconflictlabels | labels = _defaultconflictlabels | ||||
| if markerstyle != 'basic': | if markerstyle != 'basic': | ||||
| labels = _formatlabels(repo, fcd, fco, fca, labels) | labels = _formatlabels(repo, fcd, fco, fca, labels) | ||||
| 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[2]) | |||||
| def _check(repo, r, ui, tool, fcd, files): | def _check(repo, r, ui, tool, fcd, files): | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| a, unused, unused, back = files | unused, 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 | ||||