This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5189

remotefilelog: remove some BC code related to streamclone
ClosedPublic

Authored by pulkit on Oct 24 2018, 10:55 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG525dcf5c1d41: remotefilelog: remove some BC code related to streamclone
Summary

Since remotefilelog is now moved to core and we have
streamclone._walkstreamfiles() in core, we don't need to have the backward
compatibility code.

People with old mercurial version should use remotefilelog from hg-experimental
repo as IMO remotefilelog will go under a good refactoring and old clients will
break.

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

pulkit created this revision.Oct 24 2018, 10:55 AM
durin42 accepted this revision.Nov 5 2018, 10:59 AM
This revision is now accepted and ready to land.Nov 5 2018, 10:59 AM
durin42 added a comment.Nov 5 2018, 10:59 AM

(In fact by this point we've already broken backwards compat with old installs, just by using zlib instead of lz4)

Closed by commit rHG525dcf5c1d41: remotefilelog: remove some BC code related to streamclone (authored by pulkit). · Explain WhyNov 5 2018, 2:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/__init__.py (56 lines)

Diff 12425

hgext/remotefilelog/__init__.py

node as nodemod, node as nodemod,
patch, patch,
registrar, registrar,
repair, repair,
repoview, repoview,
revset, revset,
scmutil, scmutil,
smartset, smartset,
streamclone,
templatekw, templatekw,
util, util,
) )
from . import ( from . import (
constants, constants,
debugcommands, debugcommands,
fileserverclient, fileserverclient,
remotefilectx, remotefilectx,
remotefilelog, remotefilelog,
remotefilelogserver, remotefilelogserver,
repack as repackmod, repack as repackmod,
shallowbundle, shallowbundle,
shallowrepo, shallowrepo,
shallowstore, shallowstore,
shallowutil, shallowutil,
shallowverifier, shallowverifier,
) )
# ensures debug commands are registered # ensures debug commands are registered
hgdebugcommands.command hgdebugcommands.command
try:
from mercurial import streamclone
streamclone._walkstreamfiles
hasstreamclone = True
except Exception:
hasstreamclone = False
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('remotefilelog', 'debug', default=False) configitem('remotefilelog', 'debug', default=False)
if repo.includepattern: if repo.includepattern:
opts['includepattern'] = '\0'.join(repo.includepattern) opts['includepattern'] = '\0'.join(repo.includepattern)
if repo.excludepattern: if repo.excludepattern:
opts['excludepattern'] = '\0'.join(repo.excludepattern) opts['excludepattern'] = '\0'.join(repo.excludepattern)
return remote._callstream('stream_out_shallow', **opts) return remote._callstream('stream_out_shallow', **opts)
else: else:
return orig() return orig()
extensions.wrapfunction(remote, 'stream_out', stream_out_shallow) extensions.wrapfunction(remote, 'stream_out', stream_out_shallow)
if hasstreamclone:
def stream_wrap(orig, op): def stream_wrap(orig, op):
setup_streamout(op.repo, op.remote) setup_streamout(op.repo, op.remote)
return orig(op) return orig(op)
extensions.wrapfunction( extensions.wrapfunction(
streamclone, 'maybeperformlegacystreamclone', stream_wrap) streamclone, 'maybeperformlegacystreamclone', stream_wrap)
def canperformstreamclone(orig, pullop, bundle2=False): def canperformstreamclone(orig, pullop, bundle2=False):
# remotefilelog is currently incompatible with the # remotefilelog is currently incompatible with the
# bundle2 flavor of streamclones, so force us to use # bundle2 flavor of streamclones, so force us to use
# v1 instead. # v1 instead.
if 'v2' in pullop.remotebundle2caps.get('stream', []): if 'v2' in pullop.remotebundle2caps.get('stream', []):
pullop.remotebundle2caps['stream'] = [ pullop.remotebundle2caps['stream'] = [
c for c in pullop.remotebundle2caps['stream'] c for c in pullop.remotebundle2caps['stream']
if c != 'v2'] if c != 'v2']
if bundle2: if bundle2:
return False, None return False, None
supported, requirements = orig(pullop, bundle2=bundle2) supported, requirements = orig(pullop, bundle2=bundle2)
if requirements is not None: if requirements is not None:
requirements.add(constants.SHALLOWREPO_REQUIREMENT) requirements.add(constants.SHALLOWREPO_REQUIREMENT)
return supported, requirements return supported, requirements
extensions.wrapfunction( extensions.wrapfunction(
streamclone, 'canperformstreamclone', canperformstreamclone) streamclone, 'canperformstreamclone', canperformstreamclone)
else:
def stream_in_shallow(orig, repo, remote, requirements):
setup_streamout(repo, remote)
requirements.add(constants.SHALLOWREPO_REQUIREMENT)
return orig(repo, remote, requirements)
extensions.wrapfunction(
localrepo.localrepository, 'stream_in', stream_in_shallow)
try: try:
orig(ui, repo, *args, **opts) orig(ui, repo, *args, **opts)
finally: finally:
if opts.get('shallow'): if opts.get('shallow'):
for r in repos: for r in repos:
if util.safehasattr(r, 'fileservice'): if util.safehasattr(r, 'fileservice'):
r.fileservice.close() r.fileservice.close()