Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revset.py @ 17980:83aa4359c49f
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 28 Nov 2012 16:15:05 -0600 |
parents | 49c85541617b b0affcb67cba |
children | 34a1a639d835 |
line wrap: on
line diff
--- a/mercurial/revset.py Thu Nov 08 11:54:08 2012 +0100 +++ b/mercurial/revset.py Wed Nov 28 16:15:05 2012 -0600 @@ -584,14 +584,6 @@ if not args: return [] s = set(_revdescendants(repo, args, followfirst)) | set(args) - - if len(subset) == len(repo): - # the passed in revisions may not exist, -1 for example - for arg in args: - if arg not in subset: - s.remove(arg) - return list(s) - return [r for r in subset if r in s] def descendants(repo, subset, x): @@ -1349,10 +1341,7 @@ Changesets in set with no parent changeset in set. """ s = set(getset(repo, repo.changelog, x)) - if len(subset) == len(repo): - subset = s - else: - subset = [r for r in subset if r in s] + subset = [r for r in subset if r in s] cs = _children(repo, subset, s) return [r for r in subset if r not in cs]