Mercurial > hg
comparison mercurial/revset.py @ 29780:531e85eec23c
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 15 Aug 2016 12:26:02 -0400 |
| parents | 9c51a5de76db 5004ef47f437 |
| children | cbf9984a7957 |
comparison
equal
deleted
inserted
replaced
| 29779:997e8cf4d0a2 | 29780:531e85eec23c |
|---|---|
| 2431 wb, tb = _optimize(x[2], small) | 2431 wb, tb = _optimize(x[2], small) |
| 2432 return wa + wb, (op, ta, tb) | 2432 return wa + wb, (op, ta, tb) |
| 2433 elif op == 'list': | 2433 elif op == 'list': |
| 2434 ws, ts = zip(*(_optimize(y, small) for y in x[1:])) | 2434 ws, ts = zip(*(_optimize(y, small) for y in x[1:])) |
| 2435 return sum(ws), (op,) + ts | 2435 return sum(ws), (op,) + ts |
| 2436 elif op == 'keyvalue': | |
| 2437 w, t = _optimize(x[2], small) | |
| 2438 return w, (op, x[1], t) | |
| 2436 elif op == 'func': | 2439 elif op == 'func': |
| 2437 f = getsymbol(x[1]) | 2440 f = getsymbol(x[1]) |
| 2438 wa, ta = _optimize(x[2], small) | 2441 wa, ta = _optimize(x[2], small) |
| 2439 if f in ("author branch closed date desc file grep keyword " | 2442 if f in ("author branch closed date desc file grep keyword " |
| 2440 "outgoing user"): | 2443 "outgoing user"): |