--- 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)