[PATCH 2 of 2 NOPUSH stable] fix bundle error (issue XXX)

[Benoit Boissinot]

On Sat, May 12, 2012 at 3:39 PM, Sune Foldager <cryo at cyanite.org> wrote:

> # HG changeset patch
> # User Sune Foldager <cryo at cyanite.org>
> # Date 1336829974 -7200
> # Branch stable
> # Node ID b81e7e187080391f0608e28fda5d11fb06c8b7ee
> # Parent  381f8c47ba233d1c80489172d59a222944f465f0
> fix bundle error (issue XXX)
>
> diff -r 381f8c47ba23 -r b81e7e187080 mercurial/localrepo.py
> --- a/mercurial/localrepo.py    Sat May 12 15:33:50 2012 +0200
> +++ b/mercurial/localrepo.py    Sat May 12 15:39:34 2012 +0200
> @@ -1782,11 +1782,7 @@
>         common = set(cl.ancestors(*[cl.rev(n) for n in bases]))
>         return self._changegroupsubset(common, csets, heads, source)
>
> -    def getlocalbundle(self, source, outgoing):
> -        """Like getbundle, but taking a discovery.outgoing as an argument.
> -
> -        This is only implemented for local repos and reuses potentially
> -        precomputed sets in outgoing."""
> +    def _getbundle(self, source, outgoing):
>         if not outgoing.missing:
>             return None
>         return self._changegroupsubset(outgoing.common,
> @@ -1794,6 +1790,18 @@
>                                        outgoing.missingheads,
>                                        source)
>
> +    def getlocalbundle(self, source, outgoing):
>

You forgot to switch push() to _getbundle().

I don't think that's the right place to fix it. I'd do it in discovery.py
and only change bundle() in commands.py. That should be much simpler.

Benoit
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120512/35f01f1a/attachment.html>