We print file paths in a lot of places in this code and I've probably
missed a few places. We can fix them as we discover them (I'm also
happy to fix anything reviewers notice, of course).
| Lint Skipped |
| Unit Tests Skipped |
I'll add some tests to this soon. I created the review early just so I can get feedback.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/filemerge.py (33 lines) | |||
| M | tests/test-merge10.t (5 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Jan 30 2019, 3:05 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| util.writefile(file, newdata) | util.writefile(file, newdata) | ||||
| @internaltool('prompt', nomerge) | @internaltool('prompt', nomerge) | ||||
| def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | ||||
| """Asks the user which of the local `p1()` or the other `p2()` version to | """Asks the user which of the local `p1()` or the other `p2()` version to | ||||
| keep as the merged version.""" | keep as the merged version.""" | ||||
| ui = repo.ui | ui = repo.ui | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| uipathfn = scmutil.getuipathfn(repo) | |||||
| # Avoid prompting during an in-memory merge since it doesn't support merge | # Avoid prompting during an in-memory merge since it doesn't support merge | ||||
| # conflicts. | # conflicts. | ||||
| if fcd.changectx().isinmemory(): | if fcd.changectx().isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError('in-memory merge does not ' | raise error.InMemoryMergeConflictsError('in-memory merge does not ' | ||||
| 'support file conflicts') | 'support file conflicts') | ||||
| prompts = partextras(labels) | prompts = partextras(labels) | ||||
| prompts['fd'] = fd | prompts['fd'] = uipathfn(fd) | ||||
| try: | try: | ||||
| if fco.isabsent(): | if fco.isabsent(): | ||||
| index = ui.promptchoice( | index = ui.promptchoice( | ||||
| _localchangedotherdeletedmsg % prompts, 2) | _localchangedotherdeletedmsg % prompts, 2) | ||||
| choice = ['local', 'other', 'unresolved'][index] | choice = ['local', 'other', 'unresolved'][index] | ||||
| elif fcd.isabsent(): | elif fcd.isabsent(): | ||||
| index = ui.promptchoice( | index = ui.promptchoice( | ||||
| _otherchangedlocaldeletedmsg % prompts, 2) | _otherchangedlocaldeletedmsg % prompts, 2) | ||||
| 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 | ||||
| _restorebackup(fcd, back) | _restorebackup(fcd, back) | ||||
| 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, scriptfn = toolconf | tool, toolpath, binary, symlink, scriptfn = toolconf | ||||
| uipathfn = scmutil.getuipathfn(repo) | |||||
| 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, uipathfn(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, uipathfn(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 | ||||
| # things for us to import cmdutil. | # things for us to import cmdutil. | ||||
| tres = formatter.templateresources(ui, repo) | tres = formatter.templateresources(ui, repo) | ||||
| t = formatter.maketemplater(ui, tmpl, defaults=templatekw.keywords, | t = formatter.maketemplater(ui, tmpl, defaults=templatekw.keywords, | ||||
| resources=tres) | resources=tres) | ||||
| ui.status(t.renderdefault(props)) | ui.status(t.renderdefault(props)) | ||||
| 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, scriptfn = toolconf | tool, toolpath, binary, symlink, scriptfn = toolconf | ||||
| uipathfn = scmutil.getuipathfn(repo) | |||||
| 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, uipathfn(fcd.path()))) | ||||
| return False, 1, None | return False, 1, None | ||||
| unused, unused, unused, back = files | unused, unused, unused, back = files | ||||
| localpath = _workingpath(repo, fcd) | localpath = _workingpath(repo, fcd) | ||||
| args = _toolstr(repo.ui, tool, "args") | args = _toolstr(repo.ui, tool, "args") | ||||
| with _maketempfiles(repo, fco, fca, repo.wvfs.join(back.path()), | with _maketempfiles(repo, fco, fca, repo.wvfs.join(back.path()), | ||||
| "$output" in args) as temppaths: | "$output" in args) as temppaths: | ||||
| basepath, otherpath, localoutputpath = temppaths | basepath, otherpath, localoutputpath = temppaths | ||||
| replace = {'local': localpath, 'base': basepath, 'other': otherpath, | replace = {'local': localpath, 'base': basepath, 'other': otherpath, | ||||
| 'output': outpath, 'labellocal': mylabel, | 'output': outpath, 'labellocal': mylabel, | ||||
| 'labelother': otherlabel, 'labelbase': baselabel} | 'labelother': otherlabel, 'labelbase': baselabel} | ||||
| args = util.interpolate( | args = util.interpolate( | ||||
| br'\$', replace, args, | br'\$', replace, args, | ||||
| lambda s: procutil.shellquote(util.localpath(s))) | lambda s: procutil.shellquote(util.localpath(s))) | ||||
| 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, uipathfn(fcd.path()))) | ||||
| if scriptfn is None: | if scriptfn is None: | ||||
| cmd = toolpath + ' ' + args | cmd = toolpath + ' ' + args | ||||
| repo.ui.debug('launching merge tool: %s\n' % cmd) | repo.ui.debug('launching merge tool: %s\n' % cmd) | ||||
| _describemerge(ui, repo, mynode, fcd, fca, fco, env, toolpath, args) | _describemerge(ui, repo, mynode, fcd, fca, fco, env, toolpath, args) | ||||
| r = ui.system(cmd, cwd=repo.root, environ=env, | r = ui.system(cmd, cwd=repo.root, environ=env, | ||||
| blockedtag='mergetool') | blockedtag='mergetool') | ||||
| else: | else: | ||||
| repo.ui.debug('launching python merge script: %s:%s\n' % | repo.ui.debug('launching python merge script: %s:%s\n' % | ||||
| Returns whether the merge is complete, the return value of the merge, and | Returns whether the merge is complete, the return value of the merge, and | ||||
| a boolean indicating whether the file was deleted from disk.""" | a boolean indicating whether the file was deleted from disk.""" | ||||
| if not fco.cmp(fcd): # files identical? | if not fco.cmp(fcd): # files identical? | ||||
| return True, None, False | return True, None, False | ||||
| ui = repo.ui | ui = repo.ui | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| uipathfn = scmutil.getuipathfn(repo) | |||||
| fduipath = uipathfn(fd) | |||||
| binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | ||||
| symlink = 'l' in fcd.flags() + fco.flags() | symlink = 'l' in fcd.flags() + fco.flags() | ||||
| changedelete = fcd.isabsent() or fco.isabsent() | changedelete = fcd.isabsent() or fco.isabsent() | ||||
| tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) | tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) | ||||
| scriptfn = None | scriptfn = None | ||||
| if tool in internals and tool.startswith('internal:'): | if tool in internals and tool.startswith('internal:'): | ||||
| # normalize to new-style names (':merge' etc) | # normalize to new-style names (':merge' etc) | ||||
| tool = tool[len('internal'):] | tool = tool[len('internal'):] | ||||
| if toolpath and toolpath.startswith('python:'): | if toolpath and toolpath.startswith('python:'): | ||||
| invalidsyntax = False | invalidsyntax = False | ||||
| if toolpath.count(':') >= 2: | if toolpath.count(':') >= 2: | ||||
| script, scriptfn = toolpath[7:].rsplit(':', 1) | script, scriptfn = toolpath[7:].rsplit(':', 1) | ||||
| if not scriptfn: | if not scriptfn: | ||||
| invalidsyntax = True | invalidsyntax = True | ||||
| # missing :callable can lead to spliting on windows drive letter | # missing :callable can lead to spliting on windows drive letter | ||||
| if '\\' in scriptfn or '/' in scriptfn: | if '\\' in scriptfn or '/' in scriptfn: | ||||
| invalidsyntax = True | invalidsyntax = True | ||||
| else: | else: | ||||
| invalidsyntax = True | invalidsyntax = True | ||||
| if invalidsyntax: | if invalidsyntax: | ||||
| raise error.Abort(_("invalid 'python:' syntax: %s") % toolpath) | raise error.Abort(_("invalid 'python:' syntax: %s") % toolpath) | ||||
| toolpath = script | toolpath = script | ||||
| ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | ||||
| % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink), | % (tool, fduipath, pycompat.bytestr(binary), | ||||
| pycompat.bytestr(changedelete))) | pycompat.bytestr(symlink), pycompat.bytestr(changedelete))) | ||||
| if tool in internals: | if tool in internals: | ||||
| func = internals[tool] | func = internals[tool] | ||||
| mergetype = func.mergetype | mergetype = func.mergetype | ||||
| onfailure = func.onfailure | onfailure = func.onfailure | ||||
| precheck = func.precheck | precheck = func.precheck | ||||
| isexternal = False | isexternal = False | ||||
| else: | else: | ||||
| toolconf = tool, toolpath, binary, symlink, scriptfn | toolconf = tool, toolpath, binary, symlink, scriptfn | ||||
| if mergetype == nomerge: | if mergetype == nomerge: | ||||
| r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||||
| return True, r, deleted | return True, r, deleted | ||||
| if premerge: | if premerge: | ||||
| if orig != fco.path(): | if orig != fco.path(): | ||||
| ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) | ui.status(_("merging %s and %s to %s\n") % | ||||
| (uipathfn(orig), uipathfn(fco.path()), fduipath)) | |||||
| else: | else: | ||||
| ui.status(_("merging %s\n") % fd) | ui.status(_("merging %s\n") % fduipath) | ||||
| 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: | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError('in-memory merge does ' | raise error.InMemoryMergeConflictsError('in-memory merge does ' | ||||
| 'not support merge ' | 'not support merge ' | ||||
| 'conflicts') | 'conflicts') | ||||
| ui.warn(onfailure % fd) | ui.warn(onfailure % fduipath) | ||||
| return True, 1, False | return True, 1, False | ||||
| back = _makebackup(repo, ui, wctx, 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: | ||||
| internalmarkerstyle = ui.config('ui', 'mergemarkers') | internalmarkerstyle = ui.config('ui', 'mergemarkers') | ||||
| if isexternal: | if isexternal: | ||||
| r = _check(repo, r, ui, tool, fcd, files) | r = _check(repo, r, ui, tool, fcd, files) | ||||
| if r: | if r: | ||||
| if onfailure: | if onfailure: | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError('in-memory merge ' | raise error.InMemoryMergeConflictsError('in-memory merge ' | ||||
| 'does not support ' | 'does not support ' | ||||
| 'merge conflicts') | 'merge conflicts') | ||||
| ui.warn(onfailure % fd) | ui.warn(onfailure % fduipath) | ||||
| _onfilemergefailure(ui) | _onfilemergefailure(ui) | ||||
| 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: | ||||
| back.remove() | back.remove() | ||||
| def _haltmerge(): | def _haltmerge(): | ||||
| # default action is 'continue', in which case we neither prompt nor halt | # default action is 'continue', in which case we neither prompt nor halt | ||||
| def hasconflictmarkers(data): | def hasconflictmarkers(data): | ||||
| return bool(re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", data, | return bool(re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", data, | ||||
| re.MULTILINE)) | re.MULTILINE)) | ||||
| def _check(repo, r, ui, tool, fcd, files): | def _check(repo, r, ui, tool, fcd, files): | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| uipathfn = scmutil.getuipathfn(repo) | |||||
| 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 hasconflictmarkers(fcd.data()): | if hasconflictmarkers(fcd.data()): | ||||
| 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") % uipathfn(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 not fcd.cmp(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") % uipathfn(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) | ||||
| return r | return r | ||||
| def _workingpath(repo, ctx): | def _workingpath(repo, ctx): | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| new changesets cc7000b01af9 | new changesets cc7000b01af9 | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| $ hg up -C 2 | $ hg up -C 2 | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg merge | Abuse this test for also testing that merge respects ui.relative-paths | ||||
| merging testdir/subdir/a and testdir/a to testdir/subdir/a | $ hg --cwd testdir merge --config ui.relative-paths=yes | ||||
| merging subdir/a and a to subdir/a | |||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg stat | $ hg stat | ||||
| M testdir/subdir/a | M testdir/subdir/a | ||||
| $ hg diff --nodates | $ hg diff --nodates | ||||
| diff -r bc21c9773bfa testdir/subdir/a | diff -r bc21c9773bfa testdir/subdir/a | ||||
| --- a/testdir/subdir/a | --- a/testdir/subdir/a | ||||
| +++ b/testdir/subdir/a | +++ b/testdir/subdir/a | ||||
| @@ -1,1 +1,1 @@ | @@ -1,1 +1,1 @@ | ||||
| -a | -a | ||||
| +alpha | +alpha | ||||
| $ cd .. | $ cd .. | ||||