Mercurial > hg
comparison hgext/convert/common.py @ 15611:ec8a49c46d7e
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 05 Dec 2011 17:48:40 -0600 |
| parents | 2ad4e9b44d8b 63ff8fe3a8f0 |
| children | a814f8fcc65a |
comparison
equal
deleted
inserted
replaced
| 15606:2ad4e9b44d8b | 15611:ec8a49c46d7e |
|---|---|
| 380 if err.errno != errno.ENOENT: | 380 if err.errno != errno.ENOENT: |
| 381 raise | 381 raise |
| 382 return | 382 return |
| 383 for i, line in enumerate(fp): | 383 for i, line in enumerate(fp): |
| 384 try: | 384 try: |
| 385 key, value = line.splitlines()[0].rsplit(' ', 1) | 385 key, value = line.splitlines()[0].rstrip().rsplit(' ', 1) |
| 386 except ValueError: | 386 except ValueError: |
| 387 raise util.Abort( | 387 raise util.Abort( |
| 388 _('syntax error in %s(%d): key/value pair expected') | 388 _('syntax error in %s(%d): key/value pair expected') |
| 389 % (self.path, i + 1)) | 389 % (self.path, i + 1)) |
| 390 if key not in self: | 390 if key not in self: |