mercurial-scm/hg-stable: mercurial/revlog.py comparison

merge with stable

comparison

equal deleted inserted replaced

-:2e31a17ad1bf
+:8f016345e6b0
 from __future__ import absolute_import
 import collections
 import errno
+import os
 import struct
 import zlib
 # import stuff from node for others to import from revlog
 from .node import (
 self._cache = (node, curr, text)
 self._basecache = (curr, chainbase)
 return node
 def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset):
+# Files opened in a+ mode have inconsistent behavior on various
+# platforms. Windows requires that a file positioning call be made
+# when the file handle transitions between reads and writes. See
+# 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other
+# platforms, Python or the platform itself can be buggy. Some versions
+# of Solaris have been observed to not append at the end of the file
+# if the file was seeked to before the end. See issue4943 for more.
+#
+# We work around this issue by inserting a seek() before writing.
+# Note: This is likely not necessary on Python 3.
+ifh.seek(0, os.SEEK_END)
+if dfh:
+dfh.seek(0, os.SEEK_END)
 curr = len(self) - 1
 if not self._inline:
 transaction.add(self.datafile, offset)
 transaction.add(self.indexfile, curr * len(entry))
 if data[0]:

Mercurial > public > mercurial-scm > hg-stable