Mercurial > public > mercurial-scm > hg
comparison mercurial/revset.py @ 25342:5dde117269b6
revset: make "null" able to appear in internal _list() expression
This is the same workaround introduced at e16456831516. Without this patch,
"null or x" can't be optimized to _list(null x).
Test case will be added by the next patch.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 29 May 2015 21:31:00 +0900 |
| parents | 9d6cc87bd507 |
| children | 7fbef7932af9 |
comparison
equal
deleted
inserted
replaced
| 25341:9d6cc87bd507 | 25342:5dde117269b6 |
|---|---|
| 1926 seen = set() | 1926 seen = set() |
| 1927 for t in s.split('\0'): | 1927 for t in s.split('\0'): |
| 1928 r = repo[t].rev() | 1928 r = repo[t].rev() |
| 1929 if r in seen: | 1929 if r in seen: |
| 1930 continue | 1930 continue |
| 1931 if r in subset: | 1931 if (r in subset |
| 1932 or r == node.nullrev and isinstance(subset, fullreposet)): | |
| 1932 ls.append(r) | 1933 ls.append(r) |
| 1933 seen.add(r) | 1934 seen.add(r) |
| 1934 return baseset(ls) | 1935 return baseset(ls) |
| 1935 | 1936 |
| 1936 # for internal use | 1937 # for internal use |