D6475: merge: fix race that could cause wrong size in dirstate

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Jun 12 14:05:14 EDT 2019


martinvonz added inline comments.

INLINE COMMENTS

> context.py:1769
>          return self._repo.wvfs.lstat(self._path).st_size
> +    def lstat(self):
> +        return self._repo.wvfs.lstat(self._path)

Does overlayworkingfilectx also need to implement this function?

> context.py:1806
>          """wraps repo.wwrite"""
> -        self._repo.wwrite(self._path, data, flags,
> -                          backgroundclose=backgroundclose,
> -                          **kwargs)
> +        return self._repo.wwrite(self._path, data, flags,
> +                                 backgroundclose=backgroundclose,

Was this necessary for this patch? Why?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6475/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6475

To: valentin.gatienbaron, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list