[PATCH 2 of 4] Fix up walk and changes code

Bryan O'Sullivan bos at serpentine.com
Mon Aug 1 13:22:28 CDT 2005


On Mon, 2005-08-01 at 19:03 +0200, Thomas Arendsen Hein wrote:
> * Thomas Arendsen Hein <thomas at intevation.de> [20050801 07:51]:
> > * Bryan O'Sullivan <bos at serpentine.com> [20050801 04:10]:
> > >      (c, a, d, u) = repo.changes(files = files, match = matchfn)
> > > -    (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
> > > +    (c, a, d, u) = [map(lambda x: pathto(cwd, x), n) for n in c, a, d, u]
> > 
> > Huh, this looks like apples and pears on a cherry tree :)
> 
> * Bryan O'Sullivan <bos at serpentine.com> [20050801 16:44]:
> > I know, but I kept the style the same as the line of code I replaced.
> 
> No, you added apples (list comrehension) to the pear-cherry-tree :)
> 
> [map(foo, n) for n in c, a, d, u] instead of map(foo, (c, a, d, u))

I'm sorry, I still don't understand what you're trying to say.

> BTW, when I tried pulling from you I got 48 new changesets since the
> last time I pulled, resulting in two heads (823:b678e6d4f92d and
> 775:ba5c2021364e) with conflicts. Did you erase the repo and clone
> from upstream again? 

I think so.  But you shouldn't have gotten any new changesets other than
the four I had.

	<b



More information about the Mercurial mailing list