Mercurial > public > mercurial-scm > hg
diff mercurial/utils/storageutil.py @ 40460:4fe63b573791
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 02 Nov 2018 14:24:29 -0400 |
| parents | 968dd7e02ac5 634b45317459 |
| children | aeb2be20b33b |
line wrap: on
line diff
--- a/mercurial/utils/storageutil.py Sat Oct 13 01:55:40 2018 -0700 +++ b/mercurial/utils/storageutil.py Fri Nov 02 14:24:29 2018 -0400 @@ -340,11 +340,11 @@ if nodesorder == 'nodes': revs = [frev(n) for n in nodes] - elif nodesorder == 'storage': - revs = sorted(frev(n) for n in nodes) - else: + elif nodesorder == 'linear': revs = set(frev(n) for n in nodes) revs = dagop.linearize(revs, store.parentrevs) + else: # storage and default + revs = sorted(frev(n) for n in nodes) prevrev = None