| durin42 |
| hg-reviewers |
With in-memory merge, backup files might be overlayworkingfilectxs stored
in memory. But they could also be real files if the user's backup directory is
outside the working dir.
Rather than have two code paths everywhere, let's use arbitraryfilectx so they
can be consistent.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
(Feel free to push back with a TODO documenting how to do a fix or something.)
| mercurial/filemerge.py | ||
|---|---|---|
| 604–606 | Well that's a bummer. Could we move context.*filectx* into mercurial.filecontext and then avoid the need for this function-level import? | |
| mercurial/filemerge.py | ||
|---|---|---|
| 604–606 | I don't think so, because the filectx classes reference the ctx classes in various places. | |
| mercurial/filemerge.py | ||
|---|---|---|
| 604–606 | Ick. Please add a TODO here to figure out a way to break the cycle (it can be done! I'm sure of it, even if I don't yet know how) and then we can move forward with this. | |
| mercurial/filemerge.py | ||
|---|---|---|
| 604–606 | Sure, will do. I think most likely by breaking the context -> fileset dependency. | |
| # filemerge.py - file-level merge handling for Mercurial | # filemerge.py - file-level merge handling for Mercurial | ||||
| # | # | ||||
| # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> | # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import filecmp | |||||
| import os | import os | ||||
| import re | import re | ||||
| import tempfile | import tempfile | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import nullid, short | from .node import nullid, short | ||||
| from . import ( | from . import ( | ||||
| if '\r\n' in data: # Windows | if '\r\n' in data: # Windows | ||||
| return '\r\n' | return '\r\n' | ||||
| if '\r' in data: # Old Mac | if '\r' in data: # Old Mac | ||||
| return '\r' | return '\r' | ||||
| if '\n' in data: # UNIX | if '\n' in data: # UNIX | ||||
| return '\n' | return '\n' | ||||
| return None # unknown | return None # unknown | ||||
| def _matcheol(file, origfile): | def _matcheol(file, back): | ||||
| "Convert EOL markers in a file to match origfile" | "Convert EOL markers in a file to match origfile" | ||||
| tostyle = _eoltype(util.readfile(origfile)) | tostyle = _eoltype(back.data()) # No repo.wread filters? | ||||
| if tostyle: | if tostyle: | ||||
| data = util.readfile(file) | data = util.readfile(file) | ||||
| style = _eoltype(data) | style = _eoltype(data) | ||||
| if style: | if style: | ||||
| newdata = data.replace(style, tostyle) | newdata = data.replace(style, tostyle) | ||||
| if newdata != data: | if newdata != data: | ||||
| util.writefile(file, newdata) | util.writefile(file, newdata) | ||||
| '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 | # read input from backup, write to original | ||||
| out = a | |||||
| a = repo.wvfs.join(back.path()) | |||||
| 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) | ||||
| return { | return { | ||||
| "l": " [%s]" % labels[0], | "l": " [%s]" % labels[0], | ||||
| "o": " [%s]" % labels[1], | "o": " [%s]" % labels[1], | ||||
| } | } | ||||
| def _restorebackup(fcd, back): | def _restorebackup(fcd, back): | ||||
| # TODO: Add a workingfilectx.write(otherfilectx) path so we can use | # TODO: Add a workingfilectx.write(otherfilectx) path so we can use | ||||
| # util.copy here instead. | # util.copy here instead. | ||||
| fcd.write(util.readfile(back), fcd.flags()) | fcd.write(back.data(), fcd.flags()) | ||||
| def _makebackup(repo, ui, fcd, premerge): | def _makebackup(repo, ui, wctx, fcd, premerge): | ||||
| """Makes a backup of the local `fcd` file prior to merging. | """Makes and returns a filectx-like object for ``fcd``'s backup file. | ||||
| 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. | ||||
| """ | """ | ||||
| if fcd.isabsent(): | if fcd.isabsent(): | ||||
| return None | return None | ||||
| # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset -> | |||||
| # merge -> filemerge). (I suspect the fileset import is the weakest link) | |||||
| from . import context | |||||
durin42: Well that's a bummer. Could we move context.*filectx* into mercurial.filecontext and then avoid… | |||||
I don't think so, because the filectx classes reference the ctx classes in various places. phillco: I don't think so, because the filectx classes reference the ctx classes in various places. | |||||
Ick. Please add a TODO here to figure out a way to break the cycle (it can be done! I'm sure of it, even if I don't yet know how) and then we can move forward with this. durin42: Ick. Please add a TODO here to figure out a way to break the cycle (it can be done! I'm sure of… | |||||
Sure, will do. I think most likely by breaking the context -> fileset dependency. phillco: Sure, will do. I think most likely by breaking the context -> fileset dependency. | |||||
@durin42 done phillco: @durin42 done | |||||
| 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 context.arbitraryfilectx(back, repo=repo) | ||||
| def _maketempfiles(repo, 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. | ||||
| """ | """ | ||||
| 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) | ||||
| ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ||||
| 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, wctx, fcd, premerge) | ||||
| files = (None, None, None, 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) | back.remove() | ||||
| def _check(repo, r, ui, tool, fcd, files): | def _check(repo, r, ui, tool, fcd, files): | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| unused, 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 | ||||
| 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(_workingpath(repo, fcd), back): | if back is not None and not fcd.cmp(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(_workingpath(repo, fcd), back) | _matcheol(_workingpath(repo, fcd), back) | ||||
Well that's a bummer. Could we move context.*filectx* into mercurial.filecontext and then avoid the need for this function-level import?