Mercurial > public > mercurial-scm > hg

comparison mercurial/revset.py @ 25023:405cb38448ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: remove duplicated definition of choice() from addset._iterordered() choice() is already defined before val1 = None. Perhaps there was merge or rebase error.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 27 Apr 2015 23:03:20 +0900
parents 6b54f749659b
children 263bbed1833c
comparison
equal deleted inserted replaced
25022:10bbdcd89164 25023:405cb38448ad
3042 if ascending: 3042 if ascending:
3043 choice = min 3043 choice = min
3044 3044
3045 val1 = None 3045 val1 = None
3046 val2 = None 3046 val2 = None
3047
3048 choice = max
3049 if ascending:
3050 choice = min
3051 try: 3047 try:
3052 # Consume both iterators in an ordered way until one is 3048 # Consume both iterators in an ordered way until one is
3053 # empty 3049 # empty
3054 while True: 3050 while True:
3055 if val1 is None: 3051 if val1 is None: