##// END OF EJS Templates
widening: pass in matchers instead of patterns...
Martin von Zweigbergk -
r43543:63d440be default
parent child Browse files
Show More
@@ -112,20 +112,8 b' def generateellipsesbundle2('
112
112
113
113
114 def generate_ellipses_bundle2_for_widening(
114 def generate_ellipses_bundle2_for_widening(
115 bundler,
115 bundler, repo, oldmatch, newmatch, version, common, known,
116 repo,
117 oldinclude,
118 oldexclude,
119 newinclude,
120 newexclude,
121 version,
122 common,
123 known,
124 ):
116 ):
125 newmatch = narrowspec.match(
126 repo.root, include=newinclude, exclude=newexclude
127 )
128
129 common = set(common or [nullid])
117 common = set(common or [nullid])
130 # Steps:
118 # Steps:
131 # 1. Send kill for "$known & ::common"
119 # 1. Send kill for "$known & ::common"
@@ -102,13 +102,13 b' def narrow_widen('
102 cgversion = cgversion
102 cgversion = cgversion
103
103
104 bundler = bundle2.bundle20(repo.ui)
104 bundler = bundle2.bundle20(repo.ui)
105 newmatch = narrowspec.match(
106 repo.root, include=newincludes, exclude=newexcludes
107 )
108 oldmatch = narrowspec.match(
109 repo.root, include=oldincludes, exclude=oldexcludes
110 )
105 if not ellipses:
111 if not ellipses:
106 newmatch = narrowspec.match(
107 repo.root, include=newincludes, exclude=newexcludes
108 )
109 oldmatch = narrowspec.match(
110 repo.root, include=oldincludes, exclude=oldexcludes
111 )
112 bundle2.widen_bundle(
112 bundle2.widen_bundle(
113 bundler,
113 bundler,
114 repo,
114 repo,
@@ -121,15 +121,7 b' def narrow_widen('
121 )
121 )
122 else:
122 else:
123 narrowbundle2.generate_ellipses_bundle2_for_widening(
123 narrowbundle2.generate_ellipses_bundle2_for_widening(
124 bundler,
124 bundler, repo, oldmatch, newmatch, cgversion, common, known,
125 repo,
126 oldincludes,
127 oldexcludes,
128 newincludes,
129 newexcludes,
130 cgversion,
131 common,
132 known,
133 )
125 )
134 except error.Abort as exc:
126 except error.Abort as exc:
135 bundler = bundle2.bundle20(repo.ui)
127 bundler = bundle2.bundle20(repo.ui)
General Comments 0
You need to be logged in to leave comments. Login now