( )⚙ D4690 streamclone: reimplement nested context manager

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4690

streamclone: reimplement nested context manager
ClosedPublic

Authored by durin42 on Sep 21 2018, 11:44 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG97f2992c26f6: streamclone: reimplement nested context manager
Summary

It's gone in Python 3, and you can't *ctxs into a with statement. Sigh.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 21 2018, 11:44 AM
durin42 updated this revision to Diff 11261.Sep 21 2018, 11:48 AM
Closed by commit rHG97f2992c26f6: streamclone: reimplement nested context manager (authored by durin42). · Explain WhySep 21 2018, 11:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (14 lines)

Diff 11262

mercurial/streamclone.py

# streamclone.py - producing and consuming streaming repository data # streamclone.py - producing and consuming streaming repository data
# #
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.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 contextlib import contextlib
import os import os
import struct import struct
import warnings
from .i18n import _ from .i18n import _
from . import ( from . import (
branchmap, branchmap,
cacheutil, cacheutil,
error, error,
phases, phases,
pycompat, pycompat,
chunks = _emit2(repo, entries, totalfilesize) chunks = _emit2(repo, entries, totalfilesize)
first = next(chunks) first = next(chunks)
assert first is None assert first is None
return len(entries), totalfilesize, chunks return len(entries), totalfilesize, chunks
@contextlib.contextmanager @contextlib.contextmanager
def nested(*ctxs): def nested(*ctxs):
with warnings.catch_warnings(): this = ctxs[0]
# For some reason, Python decided 'nested' was deprecated without rest = ctxs[1:]
# replacement. They officially advertised for filtering the deprecation with this:
# warning for people who actually need the feature. if rest:
warnings.filterwarnings("ignore",category=DeprecationWarning) with nested(*rest):
with contextlib.nested(*ctxs): yield
else:
yield yield
def consumev2(repo, fp, filecount, filesize): def consumev2(repo, fp, filecount, filesize):
"""Apply the contents from a version 2 streaming clone. """Apply the contents from a version 2 streaming clone.
Data is read from an object that only needs to provide a ``read(size)`` Data is read from an object that only needs to provide a ``read(size)``
method. method.
""" """