This is an archive of the discontinued Mercurial Phabricator instance.

Differential D740

tersestatus: sort the dictionary before iterating on it
ClosedPublic

Authored by pulkit on Sep 19 2017, 10:17 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1d6558f5ea74: tersestatus: sort the dictionary before iterating on it
Summary

There has report of flakiness in test-status-terse.t. In the terse code, we are
iterating on a dictionary without sorting and since python dicts are unordered,
that can be a reason behind the flakiness. Before we have a better
implementation for the terse thing, let's make sure current implementation
possess minimum bugs.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 19 2017, 10:17 PM
durin42 accepted this revision.Sep 20 2017, 12:27 PM
This revision is now accepted and ready to land.Sep 20 2017, 12:27 PM
Closed by commit rHG1d6558f5ea74: tersestatus: sort the dictionary before iterating on it (authored by pulkit). · Explain WhySep 20 2017, 12:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 1909

mercurial/cmdutil.py

continue continue
pardict = {} pardict = {}
for a in sfiles: for a in sfiles:
par = os.path.dirname(a) par = os.path.dirname(a)
pardict.setdefault(par, []).append(a) pardict.setdefault(par, []).append(a)
rs = [] rs = []
newls = [] newls = []
for par, files in pardict.iteritems(): for par, files in sorted(pardict.iteritems()):
lenpar = numfiles(par) lenpar = numfiles(par)
if lenpar == len(files): if lenpar == len(files):
newls.append(par) newls.append(par)
if not newls: if not newls:
continue continue
while newls: while newls: