This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3653

state: removing remaining instances of opts class variable
ClosedPublic

Authored by pulkit on May 24 2018, 5:00 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG6f67bfe4b82f: state: removing remaining instances of opts class variable
Summary

The cmdstate class used to have a class variable opts which used to be a dict
which stored all the data for the state. Recent cleanups removed the use of that
variable. There were couple of instances left which are removed by this patch.

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

pulkit created this revision.May 24 2018, 5:00 PM
martinvonz accepted this revision.May 24 2018, 6:21 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
mercurial/state.py
45–46

i'll delete this line in flight

This revision is now accepted and ready to land.May 24 2018, 6:21 PM
Closed by commit rHG6f67bfe4b82f: state: removing remaining instances of opts class variable (authored by pulkit). · Explain WhyMay 24 2018, 6:25 PM
This revision was automatically updated to reflect the committed changes.
pulkit added inline comments.May 25 2018, 6:03 AM
mercurial/state.py
45–46

Thanks for doing that!

Revision Contents
Changeset List

PathPackages
Mmercurial/state.py (5 lines)

Diff 8887

mercurial/state.py

The class object can write all the data to a file in .hg/ directory and The class object can write all the data to a file in .hg/ directory and
can populate the object data reading that file. can populate the object data reading that file.
Uses cbor to serialize and deserialize data while writing and reading from Uses cbor to serialize and deserialize data while writing and reading from
disk. disk.
""" """
def __init__(self, repo, fname, opts=None): def __init__(self, repo, fname):
""" repo is the repo object """ repo is the repo object
fname is the file name in which data should be stored in .hg directory fname is the file name in which data should be stored in .hg directory
opts is a dictionary of data of the statefile
""" """
martinvonzUnsubmitted
Not Done

i'll delete this line in flight

martinvonz: i'll delete this line in flight
pulkitAuthorUnsubmitted
Not Done

Thanks for doing that!

pulkit: Thanks for doing that!
self._repo = repo self._repo = repo
self.fname = fname self.fname = fname
def read(self): def read(self):
"""read the existing state file and return a dict of data stored""" """read the existing state file and return a dict of data stored"""
return self._read() return self._read()
def save(self, version, data): def save(self, version, data):
"""write all the state data stored to .hg/<filename> file """write all the state data stored to .hg/<filename> file
we use third-party library cbor to serialize data to write in the file. we use third-party library cbor to serialize data to write in the file.
""" """
if not isinstance(version, int): if not isinstance(version, int):
raise error.ProgrammingError("version of state file should be" raise error.ProgrammingError("version of state file should be"
" an integer") " an integer")
with self._repo.vfs(self.fname, 'wb', atomictemp=True) as fp: with self._repo.vfs(self.fname, 'wb', atomictemp=True) as fp:
fp.write('%d\n' % version) fp.write('%d\n' % version)
cbor.dump(self.opts, fp, canonical=True) cbor.dump(data, fp, canonical=True)
def _read(self): def _read(self):
"""reads the state file and returns a dictionary which contain """reads the state file and returns a dictionary which contain
data in the same format as it was before storing""" data in the same format as it was before storing"""
with self._repo.vfs(self.fname, 'rb') as fp: with self._repo.vfs(self.fname, 'rb') as fp:
try: try:
int(fp.readline()) int(fp.readline())
except ValueError: except ValueError: