| durham |
| Restricted Project |
I changed this in D449 to add wctx to _filemerge.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| _copytracinghint + | _copytracinghint + | ||||
| "use (c)hanged version, leave (d)eleted, or leave (u)nresolved?" | "use (c)hanged version, leave (d)eleted, or leave (u)nresolved?" | ||||
| "$$ &Changed $$ &Deleted $$ &Unresolved") | "$$ &Changed $$ &Deleted $$ &Unresolved") | ||||
| extensions.wrapfunction(filemerge, '_filemerge', _filemerge) | extensions.wrapfunction(filemerge, '_filemerge', _filemerge) | ||||
| extensions.wrapfunction(copiesmod, 'mergecopies', _mergecopies) | extensions.wrapfunction(copiesmod, 'mergecopies', _mergecopies) | ||||
| extensions.wrapfunction(cmdutil, 'amend', _amend) | extensions.wrapfunction(cmdutil, 'amend', _amend) | ||||
| def _filemerge(origfunc, premerge, repo, mynode, orig, fcd, fco, fca, | def _filemerge(origfunc, premerge, repo, wctx, mynode, orig, fcd, fco, fca, | ||||
| labels=None, *args, **kwargs): | labels=None, *args, **kwargs): | ||||
| if premerge: | if premerge: | ||||
| # copytracing worked if files to merge have different file names | # copytracing worked if files to merge have different file names | ||||
| # and filelog contents are different (fco.cmp(fcd) returns True if | # and filelog contents are different (fco.cmp(fcd) returns True if | ||||
| # they are different). If filelog contents are the same then the file | # they are different). If filelog contents are the same then the file | ||||
| # was moved in the rebase/graft/merge source, but wasn't changed in the | # was moved in the rebase/graft/merge source, but wasn't changed in the | ||||
| # rebase/graft/merge destination. This case mercurial would've handled | # rebase/graft/merge destination. This case mercurial would've handled | ||||
| # even with disabled copytracing, so we don't want to log it. | # even with disabled copytracing, so we don't want to log it. | ||||
| msg = "%s (%s; %s)" % (msg, hexes, paths) | msg = "%s (%s; %s)" % (msg, hexes, paths) | ||||
| except Exception as e: | except Exception as e: | ||||
| # we don't expect any exceptions to happen, but to be 100% | # we don't expect any exceptions to happen, but to be 100% | ||||
| # sure we don't break hg let's catch everything and log it | # sure we don't break hg let's catch everything and log it | ||||
| msg = 'failed to log: %s' % (e,) | msg = 'failed to log: %s' % (e,) | ||||
| repo.ui.log("copytrace", msg=msg, | repo.ui.log("copytrace", msg=msg, | ||||
| reponame=_getreponame(repo, repo.ui)) | reponame=_getreponame(repo, repo.ui)) | ||||
| return origfunc(premerge, repo, mynode, orig, fcd, fco, fca, labels, | return origfunc(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels, | ||||
| *args, **kwargs) | *args, **kwargs) | ||||
| def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs): | def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs): | ||||
| if "--tracecopies" in fullargs: | if "--tracecopies" in fullargs: | ||||
| ui.setconfig('experimental', 'copytrace', 'on', '--tracecopies') | ui.setconfig('experimental', 'copytrace', 'on', '--tracecopies') | ||||
| return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs) | return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs) | ||||
| def _amend(orig, ui, repo, old, extra, pats, opts): | def _amend(orig, ui, repo, old, extra, pats, opts): | ||||