comparison mercurial/localrepo.py @ 7064:582dac23ebac

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 06 Oct 2008 13:51:36 +0200
parents 58dcf10eea2b be2daa324ddf
children 40d105a12cac
comparison
equal deleted inserted replaced
7062:efc579fdaf69 7064:582dac23ebac
2017 # XXX doesn't support '\n' or '\r' in filenames 2017 # XXX doesn't support '\n' or '\r' in filenames
2018 l = fp.readline() 2018 l = fp.readline()
2019 try: 2019 try:
2020 name, size = l.split('\0', 1) 2020 name, size = l.split('\0', 1)
2021 size = int(size) 2021 size = int(size)
2022 except ValueError, TypeError: 2022 except (ValueError, TypeError):
2023 raise util.UnexpectedOutput( 2023 raise util.UnexpectedOutput(
2024 _('Unexpected response from remote server:'), l) 2024 _('Unexpected response from remote server:'), l)
2025 self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size))) 2025 self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))
2026 ofp = self.sopener(name, 'w') 2026 ofp = self.sopener(name, 'w')
2027 for chunk in util.filechunkiter(fp, limit=size): 2027 for chunk in util.filechunkiter(fp, limit=size):