##// END OF EJS Templates
merge: fix race that could cause wrong size in dirstate...
merge: fix race that could cause wrong size in dirstate The problem is that hg merge/update/etc work the following way: 1. figure out what files to update 2. apply the update to disk 3. apply the update to in-memory dirstate 4. write dirstate where step3 looks at the filesystem and assumes it sees the result of step2. If a file is changed between step2 and step3, step3 will record incorrect information in the dirstate. I avoid this by passing the size step3 needs directly from step2, for the common path (not implemented for change/delete conflicts for instance). I didn't fix the same race for the exec bit for now, because it's less likely to be problematic and I had trouble due to the fact that the dirstate stores the permissions differently from the manifest (st_mode vs '' 'l' 'x'), in combination with tests that pretend that symlinks are not supported. However, I moved the lstat from step3 to step2, which should tighten the race window markedly, both for the exec bit and for the mtime. Differential Revision: https://phab.mercurial-scm.org/D6475

File last commit:

r41171:050ea8eb default
r42656:87a34c76 default
Show More
state.py
87 lines | 2.8 KiB | text/x-python | PythonLexer
# state.py - writing and reading state files in Mercurial
#
# Copyright 2018 Pulkit Goyal <pulkitmgoyal@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""
This file contains class to wrap the state for commands and other
related logic.
All the data related to the command state is stored as dictionary in the object.
The class has methods using which the data can be stored to disk in a file under
.hg/ directory.
We store the data on disk in cbor, for which we use the CBOR format to encode
the data.
"""
from __future__ import absolute_import
from . import (
error,
util,
)
from .utils import (
cborutil,
)
class cmdstate(object):
"""a wrapper class to store the state of commands like `rebase`, `graft`,
`histedit`, `shelve` etc. Extensions can also use this to write state files.
All the data for the state is stored in the form of key-value pairs in a
dictionary.
The class object can write all the data to a file in .hg/ directory and
can populate the object data reading that file.
Uses cbor to serialize and deserialize data while writing and reading from
disk.
"""
def __init__(self, repo, fname):
""" repo is the repo object
fname is the file name in which data should be stored in .hg directory
"""
self._repo = repo
self.fname = fname
def read(self):
"""read the existing state file and return a dict of data stored"""
return self._read()
def save(self, version, data):
"""write all the state data stored to .hg/<filename> file
we use third-party library cbor to serialize data to write in the file.
"""
if not isinstance(version, int):
raise error.ProgrammingError("version of state file should be"
" an integer")
with self._repo.vfs(self.fname, 'wb', atomictemp=True) as fp:
fp.write('%d\n' % version)
for chunk in cborutil.streamencode(data):
fp.write(chunk)
def _read(self):
"""reads the state file and returns a dictionary which contain
data in the same format as it was before storing"""
with self._repo.vfs(self.fname, 'rb') as fp:
try:
int(fp.readline())
except ValueError:
raise error.CorruptedState("unknown version of state file"
" found")
return cborutil.decodeall(fp.read())[0]
def delete(self):
"""drop the state file if exists"""
util.unlinkpath(self._repo.vfs.join(self.fname), ignoremissing=True)
def exists(self):
"""check whether the state file exists or not"""
return self._repo.vfs.exists(self.fname)