| hg-reviewers |
Previously, we parsed the patch in tryimportone(). This assumes the
input is in a patch format that needs to be parsed. We want to support
feeding in data from other formats. So let's let the caller handle the
parsing.
One wonky thing about patch parsing is that patch.extract() creates
a temp file to hold the diffs and it is up to tryimportone() to
unlink that temp file. I'll improve this in a subsequent commit.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (25 lines) | |||
| M | mercurial/commands.py (8 lines) |
| # mutation of in memory commit and more. Feel free to rework the code to get | # mutation of in memory commit and more. Feel free to rework the code to get | ||||
| # there. | # there. | ||||
| extrapreimportmap = {} | extrapreimportmap = {} | ||||
| # 'postimport' are run after the commit is made and are provided the following | # 'postimport' are run after the commit is made and are provided the following | ||||
| # argument: | # argument: | ||||
| # - ctx: the changectx created by import. | # - ctx: the changectx created by import. | ||||
| extrapostimportmap = {} | extrapostimportmap = {} | ||||
| def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): | def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc): | ||||
| """Utility function used by commands.import to import a single patch | """Utility function used by commands.import to import a single patch | ||||
| This function is explicitly defined here to help the evolve extension to | This function is explicitly defined here to help the evolve extension to | ||||
| wrap this part of the import logic. | wrap this part of the import logic. | ||||
| The API is currently a bit ugly because it a simple code translation from | The API is currently a bit ugly because it a simple code translation from | ||||
| the import command. Feel free to make it better. | the import command. Feel free to make it better. | ||||
| :hunk: a patch (as a binary string) | :patchdata: a dictionary containing parsed patch data (such as from | ||||
| ``patch.extract()``) | |||||
| :parents: nodes that will be parent of the created commit | :parents: nodes that will be parent of the created commit | ||||
| :opts: the full dict of option passed to the import command | :opts: the full dict of option passed to the import command | ||||
| :msgs: list to save commit message to. | :msgs: list to save commit message to. | ||||
| (used in case we need to save it when failing) | (used in case we need to save it when failing) | ||||
| :updatefunc: a function that update a repo to a given node | :updatefunc: a function that update a repo to a given node | ||||
| updatefunc(<repo>, <node>) | updatefunc(<repo>, <node>) | ||||
| """ | """ | ||||
| # avoid cycle context -> subrepo -> cmdutil | # avoid cycle context -> subrepo -> cmdutil | ||||
| from . import context | from . import context | ||||
| extractdata = patch.extract(ui, hunk) | |||||
| tmpname = extractdata.get('filename') | tmpname = patchdata.get('filename') | ||||
| message = extractdata.get('message') | message = patchdata.get('message') | ||||
| user = opts.get('user') or extractdata.get('user') | user = opts.get('user') or patchdata.get('user') | ||||
| date = opts.get('date') or extractdata.get('date') | date = opts.get('date') or patchdata.get('date') | ||||
| branch = extractdata.get('branch') | branch = patchdata.get('branch') | ||||
| nodeid = extractdata.get('nodeid') | nodeid = patchdata.get('nodeid') | ||||
| p1 = extractdata.get('p1') | p1 = patchdata.get('p1') | ||||
| p2 = extractdata.get('p2') | p2 = patchdata.get('p2') | ||||
| nocommit = opts.get('no_commit') | nocommit = opts.get('no_commit') | ||||
| importbranch = opts.get('import_branch') | importbranch = opts.get('import_branch') | ||||
| update = not opts.get('bypass') | update = not opts.get('bypass') | ||||
| strip = opts["strip"] | strip = opts["strip"] | ||||
| prefix = opts["prefix"] | prefix = opts["prefix"] | ||||
| sim = float(opts.get('similarity') or 0) | sim = float(opts.get('similarity') or 0) | ||||
| if not tmpname: | if not tmpname: | ||||
| editform = mergeeditform(repo[None], 'import.normal') | editform = mergeeditform(repo[None], 'import.normal') | ||||
| if opts.get('exact'): | if opts.get('exact'): | ||||
| editor = None | editor = None | ||||
| else: | else: | ||||
| editor = getcommiteditor(editform=editform, | editor = getcommiteditor(editform=editform, | ||||
| **pycompat.strkwargs(opts)) | **pycompat.strkwargs(opts)) | ||||
| extra = {} | extra = {} | ||||
| for idfunc in extrapreimport: | for idfunc in extrapreimport: | ||||
| extrapreimportmap[idfunc](repo, extractdata, extra, opts) | extrapreimportmap[idfunc](repo, patchdata, extra, opts) | ||||
| overrides = {} | overrides = {} | ||||
| if partial: | if partial: | ||||
| overrides[('ui', 'allowemptycommit')] = True | overrides[('ui', 'allowemptycommit')] = True | ||||
| with repo.ui.configoverride(overrides, 'import'): | with repo.ui.configoverride(overrides, 'import'): | ||||
| n = repo.commit(message, user, | n = repo.commit(message, user, | ||||
| date, match=m, | date, match=m, | ||||
| editor=editor, extra=extra) | editor=editor, extra=extra) | ||||
| for idfunc in extrapostimport: | for idfunc in extrapostimport: | ||||
| patchurl = 'stdin' # for error message | patchurl = 'stdin' # for error message | ||||
| else: | else: | ||||
| patchurl = os.path.join(base, patchurl) | patchurl = os.path.join(base, patchurl) | ||||
| ui.status(_('applying %s\n') % patchurl) | ui.status(_('applying %s\n') % patchurl) | ||||
| patchfile = hg.openpath(ui, patchurl) | patchfile = hg.openpath(ui, patchurl) | ||||
| haspatch = False | haspatch = False | ||||
| for hunk in patch.split(patchfile): | for hunk in patch.split(patchfile): | ||||
| (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, | patchdata = patch.extract(ui, hunk) | ||||
| msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata, | |||||
| parents, opts, | parents, opts, | ||||
| msgs, hg.clean) | msgs, hg.clean) | ||||
| if msg: | if msg: | ||||
| haspatch = True | haspatch = True | ||||
| ui.note(msg + '\n') | ui.note(msg + '\n') | ||||
| if update or exact: | if update or exact: | ||||
| parents = repo[None].parents() | parents = repo[None].parents() | ||||
| else: | else: | ||||
| parents = [repo[node]] | parents = [repo[node]] | ||||
| if rej: | if rej: | ||||