Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 6953:63b5f4c73c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: mark strings for translation in Mercurial
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents ebf1462f2145
children 907e4e9bd3c4
comparison
equal deleted inserted replaced
6952:3fffba1c87d0 6953:63b5f4c73c98
1096 manifests = [self.manifest.read(self.changelog.read(p)[0]) 1096 manifests = [self.manifest.read(self.changelog.read(p)[0])
1097 for p in self.dirstate.parents() if p != nullid] 1097 for p in self.dirstate.parents() if p != nullid]
1098 wlock = self.wlock() 1098 wlock = self.wlock()
1099 for f in list: 1099 for f in list:
1100 if self.dirstate[f] != 'r': 1100 if self.dirstate[f] != 'r':
1101 self.ui.warn("%s not removed!\n" % f) 1101 self.ui.warn(_("%s not removed!\n") % f)
1102 else: 1102 else:
1103 m = f in manifests[0] and manifests[0] or manifests[1] 1103 m = f in manifests[0] and manifests[0] or manifests[1]
1104 t = self.file(f).read(m[f]) 1104 t = self.file(f).read(m[f])
1105 self.wwrite(f, t, m.flags(f)) 1105 self.wwrite(f, t, m.flags(f))
1106 self.dirstate.normal(f) 1106 self.dirstate.normal(f)
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):
2028 ofp.write(chunk) 2028 ofp.write(chunk)
2029 ofp.close() 2029 ofp.close()
2030 elapsed = time.time() - start 2030 elapsed = time.time() - start