changeset 23833:9b1d3bac61a7

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Jan 2015 12:50:46 -0800
parents 62f41f251e52 (current diff) c90d195320c5 (diff)
children bf07c19b4c82
files mercurial/revset.py tests/test-revset.t
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Tue Jan 13 16:15:02 2015 -0800
+++ b/mercurial/revset.py	Wed Jan 14 12:50:46 2015 -0800
@@ -3055,10 +3055,10 @@
             return abs(self._end - self._start) - count
 
     def isascending(self):
-        return self._start <= self._end
+        return self._ascending
 
     def isdescending(self):
-        return self._start >= self._end
+        return not self._ascending
 
     def first(self):
         if self._ascending:
--- a/tests/test-revset.t	Tue Jan 13 16:15:02 2015 -0800
+++ b/tests/test-revset.t	Wed Jan 14 12:50:46 2015 -0800
@@ -522,6 +522,9 @@
   2
   1
   0
+  $ log 'reverse(all()) & filelog(b)'
+  4
+  1
   $ log 'rev(5)'
   5
   $ log 'sort(limit(reverse(all()), 3))'