This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6383

bookmarks: use vfs.tryread() instead of reimplementing it
ClosedPublic

Authored by martinvonz on May 16 2019, 2:28 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2b77183ac477: bookmarks: use vfs.tryread() instead of reimplementing it
rHG798b27e46971: bookmarks: use vfs.tryread() instead of reimplementing it
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.May 16 2019, 2:28 AM
pulkit accepted this revision.May 16 2019, 7:05 AM
Closed by commit rHG798b27e46971: bookmarks: use vfs.tryread() instead of reimplementing it (authored by martinvonz). · Explain WhyMay 16 2019, 7:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (28 lines)

Diff 15134

mercurial/bookmarks.py

return [] return []
def _readactive(repo, marks): def _readactive(repo, marks):
""" """
Get the active bookmark. We can have an active bookmark that updates Get the active bookmark. We can have an active bookmark that updates
itself as we commit. This function returns the name of that bookmark. itself as we commit. This function returns the name of that bookmark.
It is stored in .hg/bookmarks.current It is stored in .hg/bookmarks.current
""" """
try:
file = repo.vfs('bookmarks.current')
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
return None
try:
# No readline() in osutil.posixfile, reading everything is # No readline() in osutil.posixfile, reading everything is
# cheap. # cheap.
# Note that it's possible for readlines() here to raise content = repo.vfs.tryread('bookmarks.current')
# IOError, since we might be reading the active mark over mark = encoding.tolocal((content.splitlines() or [''])[0])
# static-http which only tries to load the file when we try
# to read from it.
mark = encoding.tolocal((file.readlines() or [''])[0])
if mark == '' or mark not in marks: if mark == '' or mark not in marks:
mark = None mark = None
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
return None
finally:
file.close()
return mark return mark
def activate(repo, mark): def activate(repo, mark):
""" """
Set the given bookmark to be 'active', meaning that this bookmark will Set the given bookmark to be 'active', meaning that this bookmark will
follow new commits that are made. follow new commits that are made.
The name is recorded in .hg/bookmarks.current The name is recorded in .hg/bookmarks.current
""" """