Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 37621:5537d8f5e989
patch: make extract() a context manager (API)
Previously, this function was creating a temporary file and relying
on callers to unlink it. Yuck.
We convert the function to a context manager and tie the lifetime of
the temporary file to that of the context manager. This changed
indentation not only from the context manager, but also from the
elination of try blocks. It was just easier to split the heart of
extract() into its own function.
The single consumer of this function has been refactored to use it as
a context manager. Code for cleaning up the file in tryimportone()
has also been removed.
.. api::
``patch.extract()`` is now a context manager. Callers no longer have
to worry about deleting the temporary file it creates, as the file is
tied to the lifetime of the context manager.
Differential Revision: https://phab.mercurial-scm.org/D3306
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 12 Apr 2018 23:14:38 -0700 |
| parents | fd1dd79cff20 |
| children | 5fc502e149f1 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Apr 12 23:06:27 2018 -0700 +++ b/mercurial/commands.py Thu Apr 12 23:14:38 2018 -0700 @@ -3089,11 +3089,10 @@ haspatch = False for hunk in patch.split(patchfile): - patchdata = patch.extract(ui, hunk) - - msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata, - parents, opts, - msgs, hg.clean) + with patch.extract(ui, hunk) as patchdata: + msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata, + parents, opts, + msgs, hg.clean) if msg: haspatch = True ui.note(msg + '\n')