[PATCH] fix and document findincoming

[Benoit Boissinot]

On Tue, May 23, 2006 at 11:06:32AM -0500, Matt Mackall wrote:
> On Tue, May 23, 2006 at 10:47:30AM +0200, Benoit Boissinot wrote:
> > Hi,
> > 
> > this patch fix findincoming, I would like to get some feedback before
> > pushing to crew (all tests are passing so I'm pretty confident, but
> > since the function wasn't documented I prefer to be safe).
> > 
> > regards,
> > 
> > Benoit
> > 
> > # HG changeset patch
> > # User Benoit Boissinot <benoit.boissinot at ens-lyon.org>
> > # Node ID 11422943cf72a7cd908c24b37271874e2581e8bf
> > # Parent  3f24bc5dee81e35fd9bc7816bbf3b9af6daf7e9a
> > document and fix findincoming
> > 
> > - add documentation about what the function does, notably
> >   the fact that it updates 'base'
> > - transform the workflow to a more simple 'if elif elif else'
> > - do not call remote.branches if not necessary
> > - some nodes where missing in 'base' (from what I understand,
> >   if the root of a branch is missing but one parent is present,
> >   the parent should be in 'base')
> > - add a testcase for an incorrect outgoing that is fixed by
> >   this cset
> > - add a testcase for an empty group bug, it needs fixing
> 
> 
> All these bullet points are a pretty good indication that you're doing
> too much in one patch.

you're right, sorry
> 
> >          if self.changelog.tip() == nullid:
> > +            base[nullid] = 1
> 
> What's this about?

It match the comment I added at the beginning of the function:
base is the minimal set of nodes such as all the ancestors are both
in self and remote.
> 
> > -        rep = {}
> > +        req = dict.fromkeys(unknown)
> 
> What's this about?

req contains the nodes for which we called remote.branch, and we call
remote.branch(unknown) right after.

Do you prefer me to back it out from crew ?

thanks,

Benoit

-- 
powered by bash/screen/(urxvt/fvwm|linux-console)/gentoo/gnu/linux OS