equal
deleted
inserted
replaced
100 else: |
100 else: |
101 ellipses = bool(ellipses) |
101 ellipses = bool(ellipses) |
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, |
115 oldmatch, |
115 oldmatch, |
116 newmatch, |
116 newmatch, |
119 cgversion, |
119 cgversion, |
120 ellipses, |
120 ellipses, |
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) |
136 manargs = [(b'message', pycompat.bytestr(exc))] |
128 manargs = [(b'message', pycompat.bytestr(exc))] |
137 advargs = [] |
129 advargs = [] |