comparison hgext/convert/cvs.py @ 51687:1eab9e40c0c8

convert: fix various leaked file descriptors

Some of these only leaked if an exception occurred between the open and close,
but a lot of these leaked unconditionally.

A type hint is added to `parsesplicemap` because otherwise this change caused
pytype to change the return type from this to `Dict[nothing, nothing]`.

51686:39033e7a6e0a

import os
import re
import socket

from mercurial.i18n import _
from mercurial.pycompat import (
    open,
)
from mercurial import (
    encoding,
    error,
    util,
)

        self.changeset = None
        self.files = {}
        self.tags = {}
        self.lastbranch = {}
        self.socket = None
        self.cvsroot = open(os.path.join(cvs, b"Root"), b'rb').read()[:-1]
        self.cvsrepo = open(os.path.join(cvs, b"Repository"), b'rb').read()[:-1]
        self.encoding = encoding.encoding

        self._connect()

    def _parse(self):

                if not passw:
                    passw = b"A"
                    cvspass = os.path.expanduser(b"~/.cvspass")
                    try:
                        pf = open(cvspass, b'rb')
                        for line in pf.read().splitlines():
                            part1, part2 = line.split(b' ', 1)
                            # /1 :pserver:[e-mail]:2401/cvsroot/foo
                            # Ah<Z
                            if part1 == b'/1':
                                part1, part2 = part2.split(b' ', 1)

                            else:
                                format = format0
                            if part1 == format:
                                passw = part2
                                break
                        pf.close()
                    except IOError as inst:
                        if inst.errno != errno.ENOENT:
                            if not getattr(inst, 'filename', None):
                                inst.filename = cvspass
                            raise

51687:1eab9e40c0c8

import os
import re
import socket

from mercurial.i18n import _
from mercurial import (
    encoding,
    error,
    util,
)

        self.changeset = None
        self.files = {}
        self.tags = {}
        self.lastbranch = {}
        self.socket = None
        self.cvsroot = util.readfile(os.path.join(cvs, b"Root"))[:-1]
        self.cvsrepo = util.readfile(os.path.join(cvs, b"Repository"))[:-1]
        self.encoding = encoding.encoding

        self._connect()

    def _parse(self):

                if not passw:
                    passw = b"A"
                    cvspass = os.path.expanduser(b"~/.cvspass")
                    try:
                        for line in util.readfile(cvspass).splitlines():
                            part1, part2 = line.split(b' ', 1)
                            # /1 :pserver:[e-mail]:2401/cvsroot/foo
                            # Ah<Z
                            if part1 == b'/1':
                                part1, part2 = part2.split(b' ', 1)

                            else:
                                format = format0
                            if part1 == format:
                                passw = part2
                                break
                    except IOError as inst:
                        if inst.errno != errno.ENOENT:
                            if not getattr(inst, 'filename', None):
                                inst.filename = cvspass
                            raise