This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7680

util: implement sortdict.insert()
ClosedPublic

Authored by martinvonz on Dec 16 2019, 6:59 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG68af0228fedc: util: implement sortdict.insert()
Summary

As flagged by pytype (reported via Matt Harbison, thanks). This was
broken by bd0fd3ff9916 (util: rewrite sortdict using Python 2.7's
OrderedDict, 2017-05-16). We actually call insert() on
namespaces.py:100, but we clearly don't have test coverage of that an
no users have reported it AFAIK.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 16 2019, 6:59 PM
martinvonz updated this revision to Diff 18783.Dec 16 2019, 7:02 PM
martinvonz edited the summary of this revision. (Show Details)Dec 16 2019, 8:04 PM
martinvonz updated this revision to Diff 18784.
pulkit accepted this revision.Dec 17 2019, 3:10 AM
This revision is now accepted and ready to land.Dec 17 2019, 3:10 AM
martinvonz added a commit: rHG68af0228fedc: util: implement sortdict.insert().Dec 17 2019, 3:51 AM
Closed by commit rHG68af0228fedc: util: implement sortdict.insert() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (11 lines)

Diff 18801

mercurial/util.py

>>> d1 = sortdict([(b'a', 0), (b'b', 1)]) >>> d1 = sortdict([(b'a', 0), (b'b', 1)])
>>> d2 = d1.copy() >>> d2 = d1.copy()
>>> d2 >>> d2
sortdict([('a', 0), ('b', 1)]) sortdict([('a', 0), ('b', 1)])
>>> d2.update([(b'a', 2)]) >>> d2.update([(b'a', 2)])
>>> list(d2.keys()) # should still be in last-set order >>> list(d2.keys()) # should still be in last-set order
['b', 'a'] ['b', 'a']
>>> d1.insert(1, b'a.5', 0.5)
>>> d1
sortdict([('a', 0), ('a.5', 0.5), ('b', 1)])
''' '''
def __setitem__(self, key, value): def __setitem__(self, key, value):
if key in self: if key in self:
del self[key] del self[key]
super(sortdict, self).__setitem__(key, value) super(sortdict, self).__setitem__(key, value)
if pycompat.ispypy: if pycompat.ispypy:
# __setitem__() isn't called as of PyPy 5.8.0 # __setitem__() isn't called as of PyPy 5.8.0
def update(self, src): def update(self, src):
if isinstance(src, dict): if isinstance(src, dict):
src = pycompat.iteritems(src) src = pycompat.iteritems(src)
for k, v in src: for k, v in src:
self[k] = v self[k] = v
def insert(self, position, key, value):
for (i, (k, v)) in enumerate(list(self.items())):
if i == position:
self[key] = value
if i >= position:
del self[k]
self[k] = v
class cowdict(cow, dict): class cowdict(cow, dict):
"""copy-on-write dict """copy-on-write dict
Be sure to call d = d.preparewrite() before writing to d. Be sure to call d = d.preparewrite() before writing to d.
>>> a = cowdict() >>> a = cowdict()
>>> a is a.preparewrite() >>> a is a.preparewrite()