# HG changeset patch # User Matt Mackall # Date 1309998356 18000 # Node ID 09c9c120a817eae47152ab527ac0dad24016b268 # Parent 400ba7cccbae2c82344c6b2f3c6229a50403941d bookmarks: simplify warning code diff -r 400ba7cccbae -r 09c9c120a817 mercurial/bookmarks.py --- a/mercurial/bookmarks.py Wed Jul 06 19:25:56 2011 -0500 +++ b/mercurial/bookmarks.py Wed Jul 06 19:25:56 2011 -0500 @@ -27,10 +27,10 @@ try: for line in repo.opener('bookmarks'): line = line.strip() + if not line: + continue if ' ' not in line: - if line: - msg = _('malformed line in .hg/bookmarks: %r\n') - repo.ui.warn( msg % line) + repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n') % line) continue sha, refspec = line.split(' ', 1) refspec = encoding.tolocal(refspec)