Mercurial > hg
comparison hgext/convert/filemap.py @ 25149:3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
any() is available in all Python versions we support now.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 16 May 2015 14:30:07 -0400 |
| parents | 216fa1ba9993 |
| children | d859123e0f47 |
comparison
equal
deleted
inserted
replaced
| 25148:3b5cd6f13dcc | 25149:3f0744eeaeaf |
|---|---|
| 330 hasbranchparent = False | 330 hasbranchparent = False |
| 331 for i, p1 in enumerate(parents): | 331 for i, p1 in enumerate(parents): |
| 332 mp1 = self.parentmap[p1] | 332 mp1 = self.parentmap[p1] |
| 333 if mp1 == SKIPREV or mp1 in knownparents: | 333 if mp1 == SKIPREV or mp1 in knownparents: |
| 334 continue | 334 continue |
| 335 isancestor = util.any(p2 for p2 in parents | 335 isancestor = any(p2 for p2 in parents |
| 336 if p1 != p2 and mp1 != self.parentmap[p2] | 336 if p1 != p2 and mp1 != self.parentmap[p2] |
| 337 and mp1 in self.wantedancestors[p2]) | 337 and mp1 in self.wantedancestors[p2]) |
| 338 if not isancestor and not hasbranchparent and len(parents) > 1: | 338 if not isancestor and not hasbranchparent and len(parents) > 1: |
| 339 # This could be expensive, avoid unnecessary calls. | 339 # This could be expensive, avoid unnecessary calls. |
| 340 if self._cachedcommit(p1).branch == branch: | 340 if self._cachedcommit(p1).branch == branch: |