( )⚙ D4383 narrow: add server logic to send cg while widening without ellipsis

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4383

narrow: add server logic to send cg while widening without ellipsis
ClosedPublic

Authored by pulkit on Aug 27 2018, 8:09 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGc8e4eae84808: narrow: add server logic to send cg while widening without ellipsis
Summary

Before this patch, if you try to widen a narrow clone without ellipsis enabled,
it will be broken and the exchange.pull() done by tracked command to widen the
clone will be no-op because no custom logic exists for this and server sees that
we have all csets and it says no changes found.

The widening with ellipsis send KILL for existing changegroups and send new
changegroups because of the change in ellipsis hash, but we can prevent that in
non-ellipsis cases.

This patch adds server side logic to send the changegroups for the changesets
which are on the client again with filelogs and manifests for the new includes.
This is a very starting implementation and we send changegroups and manifests
too while we can prevent them.

Following things can definitely be improved in the logic this patch adds:

  1. Send just the filelogs and treemanifests
  2. Send the filelogs only for the additions in the include

I tried 1) here but the code is coupled tightly and the way I was able to do
that was hacking into the changegroup generation code in a very dirty way, like
adding conditionals and preventing the yield.

This patch also adds a 'widen' kwarg to prevent other commands except widening
to go through that codepath.

The test changes demonstrate that the new implementation is correct and fixes
things.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 27 2018, 8:09 AM
martinvonz added a subscriber: martinvonz.Aug 28 2018, 7:42 PM
martinvonz added inline comments.
hgext/narrow/narrowbundle2.py
77

replace by assert (if you agree with my suggestions further down)?

84–85

This is true when using ellipses as well (and the client probably has some of the filelogs too). I had imagined we'd introduce a new widen wire protocol command. That command would probably look at the known argument and would probably work the same for ellipsis or not (ellipsis-ness would be unchanged by the command). Then we will stop passing oldincludepats, oldexcludepats, and known to getbundle.

Perhaps getbundlechangegrouppart_nonellipsis can be renamed to getbundlechangegrouppart_widen already and then gradually evolve into a handler for the new command?

319

Can we not infer widen from oldincludepats, oldincludepats != includepats, excludepats?

pulkit added inline comments.Aug 29 2018, 1:13 PM
hgext/narrow/narrowbundle2.py
319

I tried that but test-narrow-acl.t fails. Also, this is the error trying to prevent which I added the widen kwarg to make sure clone operations does not go through that.

But, clones with narrowhgacl set will go through this code path.

I looked into fixing this traceback in past but was unable to fix it. Any pointer will be appreciated.

--- /storage/pulkit/hg-committed/tests/test-narrow-acl.t
+++ /storage/pulkit/hg-committed/tests/test-narrow-acl.t.err
@@ -22,21 +22,98 @@
   adding changesets
   adding manifests
   adding file changes
-  added 3 changesets with 2 changes to 2 files
-  new changesets * (glob)
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 0 changesets with 0 changes to 0 files
+  transaction abort!
+  rollback completed
+  Traceback (most recent call last):
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/scmutil.py", line 164, in callcatch
+      return func()
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 350, in _runcatchfunc
+      return _dispatch(req)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 987, in _dispatch
+      cmdpats, cmdoptions)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 733, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 995, in _runcommand
+      return cmdfunc()
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 984, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/hgext/narrow/narrowcommands.py", line 137, in clonenarrowcmd
+      return orig(ui, repo, *args, **pycompat.strkwargs(opts))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/commands.py", line 1475, in clone
+      shareopts=opts.get('shareopts'))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/hg.py", line 710, in clone
+      streamclonerequested=stream)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/hgext/narrow/narrowcommands.py", line 132, in pullnarrow
+      return orig(repo, *args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1494, in pull
+      _fullpullbundle2(repo, pullop)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1434, in _fullpullbundle2
+      _pullbundle2(pullop)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1677, in _pullbundle2
+      bundle2.processbundle(pullop.repo, bundle, op=op)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 460, in processbundle
+      processparts(repo, op, unbundler)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 467, in processparts
+      _processpart(op, part)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 534, in _processpart
+      handler(op, part)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 2138, in handlephases
+      phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/phases.py", line 603, in updatephases
+      heads = [c.node() for c in repo.set(revset, headsbyphase[phase])]
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/localrepo.py", line 916, in set
+      for r in self.revs(expr, *args):
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/localrepo.py", line 905, in revs
+      return m(self)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 2273, in mfunc
+      return getset(repo, subset, tree, order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 102, in getset
+      return methods[x[0]](repo, subset, *x[1:], order=order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 194, in differenceset
+      return getset(repo, subset, x, order) - getset(repo, subset, y, anyorder)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 102, in getset
+      return methods[x[0]](repo, subset, *x[1:], order=order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 122, in stringset
+      x = scmutil.intrev(scmutil.revsymbol(repo, x))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/scmutil.py", line 618, in revsymbol
+      raise error.RepoLookupError(_("unknown revision '%s'") % symbol)
+  RepoLookupError: unknown revision 'e74ca1f005ce671b1e03fd521eac2efb63d49b87'
+  abort: unknown revision 'e74ca1f005ce671b1e03fd521eac2efb63d49b87'!
+  [255]
martinvonz accepted this revision.Aug 29 2018, 7:35 PM
martinvonz added inline comments.
hgext/narrow/narrowbundle2.py
319

Yeah, that does seem harder than I had hoped :( I don't see much harm in adding the widen argument to the protocol, so let's just do it as you have done it here for now. It's probably pretty easy to create a separate wire protocol *command* for it later.

This revision is now accepted and ready to land.Aug 29 2018, 7:35 PM
Closed by commit rHGc8e4eae84808: narrow: add server logic to send cg while widening without ellipsis (authored by pulkit). · Explain WhyAug 29 2018, 7:45 PM
This revision was automatically updated to reflect the committed changes.
pulkit added inline comments.Aug 30 2018, 8:45 AM
hgext/narrow/narrowbundle2.py
319

Yep. You can except improvements on this from me in upcoming weeks and I will try to make this a separate wire protocol command.

Revision Contents
Changeset List

Diff 10662

hgext/narrow/narrowbundle2.py

_MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER) _MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER)
# When advertising capabilities, always include narrow clone support. # When advertising capabilities, always include narrow clone support.
def getrepocaps_narrow(orig, repo, **kwargs): def getrepocaps_narrow(orig, repo, **kwargs):
caps = orig(repo, **kwargs) caps = orig(repo, **kwargs)
caps[NARROWCAP] = ['v0'] caps[NARROWCAP] = ['v0']
return caps return caps
def getbundlechangegrouppart_nonellipsis(bundler, repo, source, bundlecaps=None,
b2caps=None, heads=None, common=None,
**kwargs):
"""Handling changegroup changegroup generation on the server when user
is widening their narrowspec"""
cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value
cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions:
raise ValueError(_('no common changegroup version'))
version = max(cgversions)
else:
raise ValueError(_("server does not advertise changegroup version,"
" can't negotiate support for ellipsis nodes"))
include = sorted(filter(bool, kwargs.get(r'includepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
common = set(common or [nullid])
if (oldinclude != include or oldexclude != exclude):
martinvonzUnsubmitted
Not Done

replace by assert (if you agree with my suggestions further down)?

martinvonz: replace by `assert` (if you agree with my suggestions further down)?
common = repo.revs("::%ln", common)
commonnodes = set()
cl = repo.changelog
for c in common:
commonnodes.add(cl.node(c))
if commonnodes:
# XXX: we should only send the filelogs (and treemanifest). user
# already has the changelog and manifest
martinvonzUnsubmitted
Not Done

This is true when using ellipses as well (and the client probably has some of the filelogs too). I had imagined we'd introduce a new widen wire protocol command. That command would probably look at the known argument and would probably work the same for ellipsis or not (ellipsis-ness would be unchanged by the command). Then we will stop passing oldincludepats, oldexcludepats, and known to getbundle.

Perhaps getbundlechangegrouppart_nonellipsis can be renamed to getbundlechangegrouppart_widen already and then gradually evolve into a handler for the new command?

martinvonz: This is true when using ellipses as well (and the client probably has some of the filelogs too).
packer = changegroup.getbundler(version, repo,
filematcher=newmatch,
fullnodes=commonnodes)
cgdata = packer.generate(set([nullid]), list(commonnodes), False,
source)
part = bundler.newpart('changegroup', data=cgdata)
part.addparam('version', version)
if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1')
# Serve a changegroup for a client with a narrow clone. # Serve a changegroup for a client with a narrow clone.
def getbundlechangegrouppart_narrow(bundler, repo, source, def getbundlechangegrouppart_narrow(bundler, repo, source,
bundlecaps=None, b2caps=None, heads=None, bundlecaps=None, b2caps=None, heads=None,
common=None, **kwargs): common=None, **kwargs):
assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') assert repo.ui.configbool('experimental', 'narrowservebrokenellipses')
cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value if cgversions: # 3.1 and 3.2 ship with an empty value
def setup(): def setup():
"""Enable narrow repo support in bundle2-related extension points.""" """Enable narrow repo support in bundle2-related extension points."""
extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow) extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)
getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS
getbundleargs['narrow'] = 'boolean' getbundleargs['narrow'] = 'boolean'
getbundleargs['widen'] = 'boolean'
getbundleargs['depth'] = 'plain' getbundleargs['depth'] = 'plain'
getbundleargs['oldincludepats'] = 'csv' getbundleargs['oldincludepats'] = 'csv'
getbundleargs['oldexcludepats'] = 'csv' getbundleargs['oldexcludepats'] = 'csv'
getbundleargs['includepats'] = 'csv' getbundleargs['includepats'] = 'csv'
getbundleargs['excludepats'] = 'csv' getbundleargs['excludepats'] = 'csv'
getbundleargs['known'] = 'csv' getbundleargs['known'] = 'csv'
# Extend changegroup serving to handle requests from narrow clients. # Extend changegroup serving to handle requests from narrow clients.
origcgfn = exchange.getbundle2partsmapping['changegroup'] origcgfn = exchange.getbundle2partsmapping['changegroup']
def wrappedcgfn(*args, **kwargs): def wrappedcgfn(*args, **kwargs):
repo = args[1] repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION): if repo.ui.has_section(_NARROWACL_SECTION):
kwargs = exchange.applynarrowacl(repo, kwargs) kwargs = exchange.applynarrowacl(repo, kwargs)
if (kwargs.get(r'narrow', False) and if (kwargs.get(r'narrow', False) and
repo.ui.configbool('experimental', 'narrowservebrokenellipses')): repo.ui.configbool('experimental', 'narrowservebrokenellipses')):
getbundlechangegrouppart_narrow(*args, **kwargs) getbundlechangegrouppart_narrow(*args, **kwargs)
elif kwargs.get(r'widen', False) and kwargs.get(r'narrow', False):
martinvonzUnsubmitted
Not Done

Can we not infer widen from oldincludepats, oldincludepats != includepats, excludepats?

martinvonz: Can we not infer `widen` from `oldincludepats, oldincludepats != includepats, excludepats`?
pulkitAuthorUnsubmitted
Not Done

I tried that but test-narrow-acl.t fails. Also, this is the error trying to prevent which I added the widen kwarg to make sure clone operations does not go through that.

But, clones with narrowhgacl set will go through this code path.

I looked into fixing this traceback in past but was unable to fix it. Any pointer will be appreciated.

--- /storage/pulkit/hg-committed/tests/test-narrow-acl.t
+++ /storage/pulkit/hg-committed/tests/test-narrow-acl.t.err
@@ -22,21 +22,98 @@
   adding changesets
   adding manifests
   adding file changes
-  added 3 changesets with 2 changes to 2 files
-  new changesets * (glob)
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 0 changesets with 0 changes to 0 files
+  transaction abort!
+  rollback completed
+  Traceback (most recent call last):
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/scmutil.py", line 164, in callcatch
+      return func()
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 350, in _runcatchfunc
+      return _dispatch(req)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 987, in _dispatch
+      cmdpats, cmdoptions)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 733, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 995, in _runcommand
+      return cmdfunc()
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/dispatch.py", line 984, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/hgext/narrow/narrowcommands.py", line 137, in clonenarrowcmd
+      return orig(ui, repo, *args, **pycompat.strkwargs(opts))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/util.py", line 1532, in check
+      return func(*args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/commands.py", line 1475, in clone
+      shareopts=opts.get('shareopts'))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/hg.py", line 710, in clone
+      streamclonerequested=stream)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/hgext/narrow/narrowcommands.py", line 132, in pullnarrow
+      return orig(repo, *args, **kwargs)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1494, in pull
+      _fullpullbundle2(repo, pullop)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1434, in _fullpullbundle2
+      _pullbundle2(pullop)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/exchange.py", line 1677, in _pullbundle2
+      bundle2.processbundle(pullop.repo, bundle, op=op)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 460, in processbundle
+      processparts(repo, op, unbundler)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 467, in processparts
+      _processpart(op, part)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 534, in _processpart
+      handler(op, part)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/bundle2.py", line 2138, in handlephases
+      phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/phases.py", line 603, in updatephases
+      heads = [c.node() for c in repo.set(revset, headsbyphase[phase])]
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/localrepo.py", line 916, in set
+      for r in self.revs(expr, *args):
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/localrepo.py", line 905, in revs
+      return m(self)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 2273, in mfunc
+      return getset(repo, subset, tree, order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 102, in getset
+      return methods[x[0]](repo, subset, *x[1:], order=order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 194, in differenceset
+      return getset(repo, subset, x, order) - getset(repo, subset, y, anyorder)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 102, in getset
+      return methods[x[0]](repo, subset, *x[1:], order=order)
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/revset.py", line 122, in stringset
+      x = scmutil.intrev(scmutil.revsymbol(repo, x))
+    File "/place/vartmp/hgtests.Hyf1ig/install/lib/python/mercurial/scmutil.py", line 618, in revsymbol
+      raise error.RepoLookupError(_("unknown revision '%s'") % symbol)
+  RepoLookupError: unknown revision 'e74ca1f005ce671b1e03fd521eac2efb63d49b87'
+  abort: unknown revision 'e74ca1f005ce671b1e03fd521eac2efb63d49b87'!
+  [255]
pulkit: I tried that but test-narrow-acl.t fails. Also, this is the error trying to prevent which I…
martinvonzUnsubmitted
Not Done

Yeah, that does seem harder than I had hoped :( I don't see much harm in adding the widen argument to the protocol, so let's just do it as you have done it here for now. It's probably pretty easy to create a separate wire protocol *command* for it later.

martinvonz: Yeah, that does seem harder than I had hoped :( I don't see much harm in adding the `widen`…
pulkitAuthorUnsubmitted
Not Done

Yep. You can except improvements on this from me in upcoming weeks and I will try to make this a separate wire protocol command.

pulkit: Yep. You can except improvements on this from me in upcoming weeks and I will try to make this…
getbundlechangegrouppart_nonellipsis(*args, **kwargs)
else: else:
origcgfn(*args, **kwargs) origcgfn(*args, **kwargs)
exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn
# Extend changegroup receiver so client can fixup after widen requests. # Extend changegroup receiver so client can fixup after widen requests.
origcghandler = bundle2.parthandlermapping['changegroup'] origcghandler = bundle2.parthandlermapping['changegroup']
def wrappedcghandler(op, inpart): def wrappedcghandler(op, inpart):
origcghandler(op, inpart) origcghandler(op, inpart)
if util.safehasattr(op, '_widen_bundle'): if util.safehasattr(op, '_widen_bundle'):
handlechangegroup_widen(op, inpart) handlechangegroup_widen(op, inpart)
wrappedcghandler.params = origcghandler.params wrappedcghandler.params = origcghandler.params
bundle2.parthandlermapping['changegroup'] = wrappedcghandler bundle2.parthandlermapping['changegroup'] = wrappedcghandler

hgext/narrow/narrowcommands.py

if narrowspec.needsexpansion(newincludes): if narrowspec.needsexpansion(newincludes):
raise error.Abort('Expansion not yet supported on pull') raise error.Abort('Expansion not yet supported on pull')
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs) orig(pullop, kwargs)
# The old{in,ex}cludepats have already been set by orig() # The old{in,ex}cludepats have already been set by orig()
kwargs['includepats'] = newincludes kwargs['includepats'] = newincludes
kwargs['excludepats'] = newexcludes kwargs['excludepats'] = newexcludes
kwargs['widen'] = True
wrappedextraprepare = extensions.wrappedfunction(exchange, wrappedextraprepare = extensions.wrappedfunction(exchange,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
# define a function that narrowbundle2 can call after creating the # define a function that narrowbundle2 can call after creating the
# backup bundle, but before applying the bundle from the server # backup bundle, but before applying the bundle from the server
def setnewnarrowpats(): def setnewnarrowpats():
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
repo.setnewnarrowpats = setnewnarrowpats repo.setnewnarrowpats = setnewnarrowpats

tests/test-narrow-widen-non-ellipsis.t

Widen the narrow spec to see the wider file. This should not get the newly Widen the narrow spec to see the wider file. This should not get the newly
added upstream revisions. added upstream revisions.
$ cd narrow $ cd narrow
$ hg tracked --addinclude wider/f $ hg tracked --addinclude wider/f
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
no changes found no changes found
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 1 files
3 local changesets published 3 local changesets published
$ hg tracked $ hg tracked
I path:inside I path:inside
Pull down the newly added upstream revision. Pull down the newly added upstream revision.
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
[255] [255]
widen the narrow spec to include the widest file widen the narrow spec to include the widest file
$ hg tracked --addinclude widest $ hg tracked --addinclude widest
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
no changes found no changes found
adding changesets
adding manifests
adding file changes
added 0 changesets with 4 changes to 2 files
5 local changesets published 5 local changesets published
abort: path ends in directory separator: widest/ abort: path ends in directory separator: widest/
[255] [255]
$ hg tracked $ hg tracked
I path:inside I path:inside
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
*: add d3/f (glob) *: add d3/f (glob)
a68ce05aaaed: add d2/f a68ce05aaaed: add d2/f
5934322a52dd: add d1/f 5934322a52dd: add d1/f
*: add d0/f (glob) *: add d0/f (glob)
$ hg tracked --addinclude d1 $ hg tracked --addinclude d1
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
adding changesets
adding manifests
adding file changes
added 0 changesets with 1 changes to 5 files
11 local changesets published 11 local changesets published
abort: path ends in directory separator: d1/ abort: path ends in directory separator: d1/
[255] [255]
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d6 I path:d6
I path:d9 I path:d9
*: add d0/f (glob) *: add d0/f (glob)
Verify shouldn't claim the repo is corrupt after a widen. Verify shouldn't claim the repo is corrupt after a widen.
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
warning: orphan data file 'meta/d1/00manifest.i'
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
warning: orphan data file 'data/d1/f.i'
4 files, 11 changesets, 4 total revisions 4 files, 11 changesets, 4 total revisions
2 warnings encountered!
Widening preserves parent of local commit Widening preserves parent of local commit
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
$ cd narrow3 $ cd narrow3
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
*: add d2/f (glob) *: add d2/f (glob)
2: add d2/f 2: add d2/f
1: add d1/f 1: add d1/f
0: add d0/f 0: add d0/f
$ hg bookmarks bookmark $ hg bookmarks bookmark
$ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
adding changesets
adding manifests
adding file changes
added 0 changesets with 1 changes to 2 files
11 local changesets published 11 local changesets published
abort: path ends in directory separator: d1/ abort: path ends in directory separator: d1/
[255] [255]
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
11: local 11: local
10: add d10/f 10: add d10/f
9: add d9/f 9: add d9/f
8: add d8/f 8: add d8/f