##// END OF EJS Templates
bookmarks: update and updatecurrentbookmark return status...
Kevin Bullock -
r15621:01368835 default
parent child Browse files
Show More
@@ -128,10 +128,10 b' def setcurrent(repo, mark):'
128
128
129 def updatecurrentbookmark(repo, oldnode, curbranch):
129 def updatecurrentbookmark(repo, oldnode, curbranch):
130 try:
130 try:
131 update(repo, oldnode, repo.branchtags()[curbranch])
131 return update(repo, oldnode, repo.branchtags()[curbranch])
132 except KeyError:
132 except KeyError:
133 if curbranch == "default": # no default branch!
133 if curbranch == "default": # no default branch!
134 update(repo, oldnode, repo.lookup("tip"))
134 return update(repo, oldnode, repo.lookup("tip"))
135 else:
135 else:
136 raise util.Abort(_("branch %s not found") % curbranch)
136 raise util.Abort(_("branch %s not found") % curbranch)
137
137
@@ -147,6 +147,7 b' def update(repo, parents, node):'
147 update = True
147 update = True
148 if update:
148 if update:
149 repo._writebookmarks(marks)
149 repo._writebookmarks(marks)
150 return update
150
151
151 def listbookmarks(repo):
152 def listbookmarks(repo):
152 # We may try to list bookmarks on a repo type that does not
153 # We may try to list bookmarks on a repo type that does not
General Comments 0
You need to be logged in to leave comments. Login now