# HG changeset patch # User Anton Shestakov # Date 1548476480 -28800 # Node ID ee7791f2515b70dfa573574e9b4866f0a99ef797 # Parent 947b81560583cf6f8d95a2fc86d04ec7185b4fd3 revset: move dagop.maxlogdepth usage to generationsrel() Not all subscript operations would want (maxlogdepth - 1) in place of None. diff -r 947b81560583 -r ee7791f2515b mercurial/revset.py --- a/mercurial/revset.py Sat Jan 26 12:20:05 2019 +0800 +++ b/mercurial/revset.py Sat Jan 26 12:21:20 2019 +0800 @@ -258,6 +258,11 @@ def generationsrel(repo, subset, x, rel, a, b, order): # TODO: rewrite tests, and drop startdepth argument from ancestors() and # descendants() predicates + if a is None: + a = -(dagop.maxlogdepth - 1) + if b is None: + b = +(dagop.maxlogdepth - 1) + (ancstart, ancstop), (descstart, descstop) = _splitrange(a, b) if ancstart is None and descstart is None: @@ -294,10 +299,6 @@ msg = _("relation subscript bounds must be integers") return getinteger(i, msg) a, b = [getbound(i) for i in (a, b)] - if a is None: - a = -(dagop.maxlogdepth - 1) - if b is None: - b = +(dagop.maxlogdepth - 1) if rel in subscriptrelations: return subscriptrelations[rel](repo, subset, x, rel, a, b, order)