[PATCH 2 of 4] Fix up walk and changes code
Thomas Arendsen Hein
thomas at intevation.de
Mon Aug 1 12:03:11 CDT 2005
* 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))
Anyway, replacing this would be good, but if I do it now in my
tree, this would yield an unnecessary conflict. To make this easy
for you, just pull from http://hg.intevation.org/mercurial-for-bos
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? If Matt pulled from you, this isn't necessary.
Thomas
--
Email: thomas at intevation.de
http://intevation.de/~thomas/
More information about the Mercurial
mailing list