diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py --- a/hgext/narrow/narrowbundle2.py +++ b/hgext/narrow/narrowbundle2.py @@ -91,7 +91,7 @@ filematcher=diffmatch, fullnodes=commonnodes) cgdata = packer.generate(set([nullid]), list(commonnodes), False, - source) + source, changelog=False) part = bundler.newpart('changegroup', data=cgdata) part.addparam('version', version) diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py +++ b/hgext/narrow/narrowcommands.py @@ -260,6 +260,8 @@ def setnewnarrowpats(): repo.setnarrowpats(newincludes, newexcludes) repo.setnewnarrowpats = setnewnarrowpats + # silence the devel-warning of applying an empty changegroup + overrides = {('devel', 'all-warnings'): False} with ui.uninterruptable(): ds = repo.dirstate @@ -267,7 +269,7 @@ with ds.parentchange(): ds.setparents(node.nullid, node.nullid) common = commoninc[0] - with wrappedextraprepare: + with wrappedextraprepare, repo.ui.configoverride(overrides, 'widen'): exchange.pull(repo, remote, heads=common) with ds.parentchange(): ds.setparents(p1, p2) diff --git a/tests/test-narrow-widen-no-ellipsis.t b/tests/test-narrow-widen-no-ellipsis.t --- a/tests/test-narrow-widen-no-ellipsis.t +++ b/tests/test-narrow-widen-no-ellipsis.t @@ -106,9 +106,6 @@ bundle2-input-bundle: with-transaction bundle2-input-part: "changegroup" (params: * mandatory) supported (glob) adding changesets - add changeset * (glob) - add changeset * (glob) - add changeset * (glob) adding manifests adding widest/ revisions (tree !) adding file changes