Show More
@@ -91,7 +91,7 b' def getbundlechangegrouppart_widen(bundl' | |||||
91 | filematcher=diffmatch, |
|
91 | filematcher=diffmatch, | |
92 | fullnodes=commonnodes) |
|
92 | fullnodes=commonnodes) | |
93 | cgdata = packer.generate(set([nullid]), list(commonnodes), False, |
|
93 | cgdata = packer.generate(set([nullid]), list(commonnodes), False, | |
94 | source) |
|
94 | source, changelog=False) | |
95 |
|
95 | |||
96 | part = bundler.newpart('changegroup', data=cgdata) |
|
96 | part = bundler.newpart('changegroup', data=cgdata) | |
97 | part.addparam('version', version) |
|
97 | part.addparam('version', version) |
@@ -260,6 +260,8 b' def _widen(ui, repo, remote, commoninc, ' | |||||
260 | def setnewnarrowpats(): |
|
260 | def setnewnarrowpats(): | |
261 | repo.setnarrowpats(newincludes, newexcludes) |
|
261 | repo.setnarrowpats(newincludes, newexcludes) | |
262 | repo.setnewnarrowpats = setnewnarrowpats |
|
262 | repo.setnewnarrowpats = setnewnarrowpats | |
|
263 | # silence the devel-warning of applying an empty changegroup | |||
|
264 | overrides = {('devel', 'all-warnings'): False} | |||
263 |
|
265 | |||
264 | with ui.uninterruptable(): |
|
266 | with ui.uninterruptable(): | |
265 | ds = repo.dirstate |
|
267 | ds = repo.dirstate | |
@@ -267,7 +269,7 b' def _widen(ui, repo, remote, commoninc, ' | |||||
267 | with ds.parentchange(): |
|
269 | with ds.parentchange(): | |
268 | ds.setparents(node.nullid, node.nullid) |
|
270 | ds.setparents(node.nullid, node.nullid) | |
269 | common = commoninc[0] |
|
271 | common = commoninc[0] | |
270 | with wrappedextraprepare: |
|
272 | with wrappedextraprepare, repo.ui.configoverride(overrides, 'widen'): | |
271 | exchange.pull(repo, remote, heads=common) |
|
273 | exchange.pull(repo, remote, heads=common) | |
272 | with ds.parentchange(): |
|
274 | with ds.parentchange(): | |
273 | ds.setparents(p1, p2) |
|
275 | ds.setparents(p1, p2) |
@@ -106,9 +106,6 b' added upstream revisions.' | |||||
106 | bundle2-input-bundle: with-transaction |
|
106 | bundle2-input-bundle: with-transaction | |
107 | bundle2-input-part: "changegroup" (params: * mandatory) supported (glob) |
|
107 | bundle2-input-part: "changegroup" (params: * mandatory) supported (glob) | |
108 | adding changesets |
|
108 | adding changesets | |
109 | add changeset * (glob) |
|
|||
110 | add changeset * (glob) |
|
|||
111 | add changeset * (glob) |
|
|||
112 | adding manifests |
|
109 | adding manifests | |
113 | adding widest/ revisions (tree !) |
|
110 | adding widest/ revisions (tree !) | |
114 | adding file changes |
|
111 | adding file changes |
General Comments 0
You need to be logged in to leave comments.
Login now