Mercurial > hg
changeset 32672:315d74d0f059
headssummary: ensure all returned lists are sorted
This is a simple step that will help to keep a stable output in coming
refactoring.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 May 2017 05:33:59 +0200 |
| parents | 81cbfaea1e0f |
| children | bd966b9f3274 |
| files | mercurial/discovery.py |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/discovery.py Mon May 29 05:37:19 2017 +0200 +++ b/mercurial/discovery.py Mon May 29 05:33:59 2017 +0200 @@ -235,6 +235,10 @@ newmap.update(repo, (ctx.rev() for ctx in missingctx)) for branch, newheads in newmap.iteritems(): headssum[branch][1][:] = newheads + for branch, items in headssum.iteritems(): + for l in items: + if l is not None: + l.sort() return headssum def _oldheadssummary(repo, remoteheads, outgoing, inc=False): @@ -244,14 +248,14 @@ # Construct {old,new}map with branch = None (topological branch). # (code based on update) knownnode = repo.changelog.hasnode # no nodemap until it is filtered - oldheads = list(h for h in remoteheads if knownnode(h)) + oldheads = sorted(h for h in remoteheads if knownnode(h)) # all nodes in outgoing.missing are children of either: # - an element of oldheads # - another element of outgoing.missing # - nullrev # This explains why the new head are very simple to compute. r = repo.set('heads(%ln + %ln)', oldheads, outgoing.missing) - newheads = list(c.node() for c in r) + newheads = sorted(c.node() for c in r) # set some unsynced head to issue the "unsynced changes" warning if inc: unsynced = [None]