comparison mercurial/bookmarks.py @ 32736:173f1bdc322d

bookmarks: rely on exception for malformed lines

Since we already have an exception context open, for other thing, we can
simplify the code a bit and rely on exception handling for invalid lines.

Speed is not the main motivation for this changes. However as I'm in the middle
of benchmarking things we can see a small positive impact.

Before:
! wall 0.009358 comb 0.000000 user 0.000000 sys 0.000000 (best of 303)

After:
! wall 0.009173 comb 0.010000 user 0.010000 sys 0.000000 (best of 310)

32735:d7522f983f37

            bkfile = _getbkfile(repo)
            for line in bkfile:
                line = line.strip()
                if not line:
                    continue
                if ' ' not in line:
                    repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n')
                                 % line)
                    continue
                sha, refspec = line.split(' ', 1)
                try:
                    node = tonode(sha)
                    if node in nm:
                        refspec = encoding.tolocal(refspec)
                        self[refspec] = node
                except (TypeError, ValueError):
                    # - bin(...) can raise TypeError
                    # - node in nm can raise ValueError for non-20-bytes entry
                    repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n')
                                 % line)
        except IOError as inst:
            if inst.errno != errno.ENOENT:
                raise

32736:173f1bdc322d

            bkfile = _getbkfile(repo)
            for line in bkfile:
                line = line.strip()
                if not line:
                    continue
                try:
                    sha, refspec = line.split(' ', 1)
                    node = tonode(sha)
                    if node in nm:
                        refspec = encoding.tolocal(refspec)
                        self[refspec] = node
                except (TypeError, ValueError):
                    # - bin(...) can raise TypeError
                    # - node in nm can raise ValueError for non-20-bytes entry
                    # - split(...) can raise ValueError for string without ' '
                    repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n')
                                 % line)
        except IOError as inst:
            if inst.errno != errno.ENOENT:
                raise