comparison mercurial/changegroup.py @ 30626:438532c99b54

changegroup: simplify 'allsupportedversions' logic Discarding '03' to add it back is a bit strange. Instead we only discard it when needed.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 19 Dec 2016 04:31:13 +0100
parents 182cacaa4c32
children 7ace5304fec5
comparison
equal deleted inserted replaced
30625:bcf4a975f93d 30626:438532c99b54
874 '03': (cg3packer, cg3unpacker), 874 '03': (cg3packer, cg3unpacker),
875 } 875 }
876 876
877 def allsupportedversions(ui): 877 def allsupportedversions(ui):
878 versions = set(_packermap.keys()) 878 versions = set(_packermap.keys())
879 versions.discard('03') 879 if not (ui.configbool('experimental', 'changegroup3') or
880 if (ui.configbool('experimental', 'changegroup3') or 880 ui.configbool('experimental', 'treemanifest')):
881 ui.configbool('experimental', 'treemanifest')): 881 versions.discard('03')
882 versions.add('03')
883 return versions 882 return versions
884 883
885 # Changegroup versions that can be applied to the repo 884 # Changegroup versions that can be applied to the repo
886 def supportedincomingversions(repo): 885 def supportedincomingversions(repo):
887 versions = allsupportedversions(repo.ui) 886 versions = allsupportedversions(repo.ui)