This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6556

cleanup: use named constants for second arg to .seek()
ClosedPublic

Authored by durin42 on Jun 20 2019, 2:36 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4eaf7197a740: cleanup: use named constants for second arg to .seek()

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

durin42 created this revision.Jun 20 2019, 2:36 PM
durin42 updated this revision to Diff 15797.Jul 8 2019, 1:15 PM
durin42 updated this revision to Diff 15798.Jul 8 2019, 1:27 PM
pulkit accepted this revision.Jul 8 2019, 5:10 PM
This revision is now accepted and ready to land.Jul 8 2019, 5:10 PM
durin42 added a commit: rHG4eaf7197a740: cleanup: use named constants for second arg to .seek().Jul 8 2019, 6:03 PM
Closed by commit rHG4eaf7197a740: cleanup: use named constants for second arg to .seek() (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jul 9 2019, 8:10 PM

@@ -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)

Nit: can be os.SEEK_END since we don't use the (new) io module on Python 2.

Revision Contents
Changeset List

PathPackages
Mhgext/fastannotate/revmap.py (3 lines)
Mmercurial/revlog.py (5 lines)
Mmercurial/tags.py (3 lines)

Diff 15816

hgext/fastannotate/revmap.py

# Copyright 2016-present Facebook. All Rights Reserved. # Copyright 2016-present Facebook. All Rights Reserved.
# #
# revmap: trivial hg hash - linelog rev bidirectional map # revmap: trivial hg hash - linelog rev bidirectional map
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import bisect import bisect
import io
import os import os
import struct import struct
from mercurial.node import hex from mercurial.node import hex
from mercurial import ( from mercurial import (
error as hgerror, error as hgerror,
pycompat, pycompat,
) )
def getlastnode(path): def getlastnode(path):
"""return the last hash in a revmap, without loading its full content. """return the last hash in a revmap, without loading its full content.
this is equivalent to `m = revmap(path); m.rev2hsh(m.maxrev)`, but faster. this is equivalent to `m = revmap(path); m.rev2hsh(m.maxrev)`, but faster.
""" """
hsh = None hsh = None
try: try:
with open(path, 'rb') as f: with open(path, 'rb') as f:
f.seek(-_hshlen, 2) f.seek(-_hshlen, io.SEEK_END)
if f.tell() > len(revmap.HEADER): if f.tell() > len(revmap.HEADER):
hsh = f.read(_hshlen) hsh = f.read(_hshlen)
except IOError: except IOError:
pass pass
return hsh return hsh

mercurial/revlog.py

and O(changes) merge between branches. and O(changes) merge between branches.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import contextlib import contextlib
import errno import errno
import io
import os import os
import struct import struct
import zlib import zlib
# import stuff from node for others to import from revlog # import stuff from node for others to import from revlog
from .node import ( from .node import (
bin, bin,
hex, hex,
A healthy revlog will return (0, 0). A healthy revlog will return (0, 0).
""" """
expected = 0 expected = 0
if len(self): if len(self):
expected = max(0, self.end(len(self) - 1)) expected = max(0, self.end(len(self) - 1))
try: try:
with self._datafp() as f: with self._datafp() as f:
f.seek(0, 2) f.seek(0, io.SEEK_END)
actual = f.tell() actual = f.tell()
dd = actual - expected dd = actual - expected
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
dd = 0 dd = 0
try: try:
f = self.opener(self.indexfile) f = self.opener(self.indexfile)
f.seek(0, 2) f.seek(0, io.SEEK_END)
actual = f.tell() actual = f.tell()
f.close() f.close()
s = self._io.size s = self._io.size
i = max(0, actual // s) i = max(0, actual // s)
di = actual - (i * s) di = actual - (i * s)
if self._inline: if self._inline:
databytes = 0 databytes = 0
for r in self: for r in self:

mercurial/tags.py

# tags.py - read tag info from local repository # tags.py - read tag info from local repository
# #
# Copyright 2009 Matt Mackall <mpm@selenic.com> # Copyright 2009 Matt Mackall <mpm@selenic.com>
# Copyright 2009 Greg Ward <greg@gerg.ca> # Copyright 2009 Greg Ward <greg@gerg.ca>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
# Currently this module only deals with reading and caching tags. # Currently this module only deals with reading and caching tags.
# Eventually, it could take care of updating (adding/removing/moving) # Eventually, it could take care of updating (adding/removing/moving)
# tags too. # tags too.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import io
from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
for name in names: for name in names:
repo.hook('pretag', throw=True, node=hex(node), tag=name, repo.hook('pretag', throw=True, node=hex(node), tag=name,
local=local) local=local)
if name in branches: if name in branches:
repo.ui.warn(_("warning: tag %s conflicts with existing" repo.ui.warn(_("warning: tag %s conflicts with existing"
" branch name\n") % name) " branch name\n") % name)
def writetags(fp, names, munge, prevtags): def writetags(fp, names, munge, prevtags):
fp.seek(0, 2) fp.seek(0, io.SEEK_END)
if prevtags and not prevtags.endswith('\n'): if prevtags and not prevtags.endswith('\n'):
fp.write('\n') fp.write('\n')
for name in names: for name in names:
if munge: if munge:
m = munge(name) m = munge(name)
else: else:
m = name m = name