durin42 updated this revision to Diff 15797. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6556?vs=15619&id=15797 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6556/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6556 AFFECTED FILES hgext/fastannotate/revmap.py mercurial/revlog.py mercurial/tags.py CHANGE DETAILS diff --git a/mercurial/tags.py b/mercurial/tags.py --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -562,7 +562,7 @@ " branch name\n") % name) def writetags(fp, names, munge, prevtags): - fp.seek(0, 2) + fp.seek(0, io.SEEK_END) if prevtags and not prevtags.endswith('\n'): fp.write('\n') for name in names: diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -16,6 +16,7 @@ import collections import contextlib import errno +import io import os import struct import zlib @@ -2306,7 +2307,7 @@ try: with self._datafp() as f: - f.seek(0, 2) + f.seek(0, io.SEEK_END) actual = f.tell() dd = actual - expected except IOError as inst: @@ -2316,7 +2317,7 @@ try: f = self.opener(self.indexfile) - f.seek(0, 2) + f.seek(0, io.SEEK_END) actual = f.tell() f.close() s = self._io.size diff --git a/hgext/fastannotate/revmap.py b/hgext/fastannotate/revmap.py --- a/hgext/fastannotate/revmap.py +++ b/hgext/fastannotate/revmap.py @@ -8,6 +8,7 @@ from __future__ import absolute_import import bisect +import io import os import struct @@ -246,7 +247,7 @@ hsh = None try: with open(path, 'rb') as f: - f.seek(-_hshlen, 2) + f.seek(-_hshlen, io.SEEK_END) if f.tell() > len(revmap.HEADER): hsh = f.read(_hshlen) except IOError: To: durin42, indygreg, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
