diff -r 204131131766 -r df41c7be16d6 mercurial/revset.py --- a/mercurial/revset.py Fri Aug 21 16:12:24 2015 -0700 +++ b/mercurial/revset.py Fri Aug 28 11:14:24 2015 +0900 @@ -92,7 +92,7 @@ If includepath is True, return (::).""" if not roots: - return baseset() + return [] parentrevs = repo.changelog.parentrevs roots = set(roots) visit = list(heads) @@ -123,8 +123,6 @@ for parent in seen[rev]: if parent in reachable: reached(rev) - reachable = baseset(reachable) - reachable.sort() return reachable def reachableroots(repo, roots, heads, includepath=False): @@ -137,9 +135,12 @@ roots = list(roots) heads = list(heads) try: - return repo.changelog.reachableroots(minroot, heads, roots, includepath) + revs = repo.changelog.reachableroots(minroot, heads, roots, includepath) except AttributeError: - return reachablerootspure(repo, minroot, roots, heads, includepath) + revs = reachablerootspure(repo, minroot, roots, heads, includepath) + revs = baseset(revs) + revs.sort() + return revs elements = { # token-type: binding-strength, primary, prefix, infix, suffix