Mercurial > hg
comparison hgext/convert/common.py @ 9542:5287de171d74
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 05 Oct 2009 22:17:39 +0200 |
| parents | 4c041f1ee1b4 314fc589b313 |
| children | 25e572394f5c |
comparison
equal
deleted
inserted
replaced
| 9541:53a95a744812 | 9542:5287de171d74 |
|---|---|
| 363 if err.errno != errno.ENOENT: | 363 if err.errno != errno.ENOENT: |
| 364 raise | 364 raise |
| 365 return | 365 return |
| 366 for i, line in enumerate(fp): | 366 for i, line in enumerate(fp): |
| 367 try: | 367 try: |
| 368 key, value = line[:-1].rsplit(' ', 1) | 368 key, value = line.splitlines()[0].rsplit(' ', 1) |
| 369 except ValueError: | 369 except ValueError: |
| 370 raise util.Abort(_('syntax error in %s(%d): key/value pair expected') | 370 raise util.Abort(_('syntax error in %s(%d): key/value pair expected') |
| 371 % (self.path, i+1)) | 371 % (self.path, i+1)) |
| 372 if key not in self: | 372 if key not in self: |
| 373 self.order.append(key) | 373 self.order.append(key) |