comparison mercurial/bookmarks.py @ 39304:fc54a290b4b0

bookmarks: adjust exception type so present(bookmark(.)) works as expected
author Yuya Nishihara <yuya@tcha.org>
date Sat, 25 Aug 2018 20:19:27 +0900
parents fbec9c0b32d3
children 713085b45810
comparison
equal deleted inserted replaced
39303:1eb370761fa0 39304:fc54a290b4b0
238 def expandname(self, bname): 238 def expandname(self, bname):
239 if bname == '.': 239 if bname == '.':
240 if self.active: 240 if self.active:
241 return self.active 241 return self.active
242 else: 242 else:
243 raise error.Abort(_("no active bookmark")) 243 raise error.RepoLookupError(_("no active bookmark"))
244 return bname 244 return bname
245 245
246 def checkconflict(self, mark, force=False, target=None): 246 def checkconflict(self, mark, force=False, target=None):
247 """check repo for a potential clash of mark with an existing bookmark, 247 """check repo for a potential clash of mark with an existing bookmark,
248 branch, or hash 248 branch, or hash