Mercurial > hg-stable
changeset 14846:5097d8b5078c
bookmarks: add a warning for non empty malformed line
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 05 Jul 2011 10:20:27 +0200 |
| parents | 677339529a53 |
| children | 400ba7cccbae |
| files | mercurial/bookmarks.py tests/test-bookmarks.t |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Tue Jul 05 10:13:54 2011 +0200 +++ b/mercurial/bookmarks.py Tue Jul 05 10:20:27 2011 +0200 @@ -28,6 +28,9 @@ for line in repo.opener('bookmarks'): line = line.strip() if ' ' not in line: + if line: + msg = _('malformed line in .hg/bookmarks: %r\n') + repo.ui.warn( msg % line) continue sha, refspec = line.strip().split(' ', 1) refspec = encoding.tolocal(refspec)
--- a/tests/test-bookmarks.t Tue Jul 05 10:13:54 2011 +0200 +++ b/tests/test-bookmarks.t Tue Jul 05 10:20:27 2011 +0200 @@ -350,3 +350,11 @@ Y 2:db815d6d32e6 * Z 3:125c9a1d6df6 x y 2:db815d6d32e6 + $ echo "Ican'thasformatedlines" >> .hg/bookmarks + $ hg bookmarks + malformed line in .hg/bookmarks: "Ican'thasformatedlines" + X2 1:925d80f479bb + Y 2:db815d6d32e6 + * Z 3:125c9a1d6df6 + x y 2:db815d6d32e6 +