Show More
@@ -8,7 +8,7 b'' | |||
|
8 | 8 | import os |
|
9 | 9 | from mercurial.i18n import _ |
|
10 | 10 | from mercurial.node import hex, bin |
|
11 |
from mercurial import encoding |
|
|
11 | from mercurial import encoding, util, obsolete, lock as lockmod | |
|
12 | 12 | import errno |
|
13 | 13 | |
|
14 | 14 | class bmstore(dict): |
@@ -178,15 +178,6 b' def iscurrent(repo, mark=None, parents=N' | |||
|
178 | 178 | marks = repo._bookmarks |
|
179 | 179 | return (mark in marks and marks[mark] in parents) |
|
180 | 180 | |
|
181 | def updatecurrentbookmark(repo, oldnode, curbranch): | |
|
182 | try: | |
|
183 | return update(repo, oldnode, repo.branchtip(curbranch)) | |
|
184 | except error.RepoLookupError: | |
|
185 | if curbranch == "default": # no default branch! | |
|
186 | return update(repo, oldnode, repo.lookup("tip")) | |
|
187 | else: | |
|
188 | raise util.Abort(_("branch %s not found") % curbranch) | |
|
189 | ||
|
190 | 181 | def deletedivergent(repo, deletefrom, bm): |
|
191 | 182 | '''Delete divergent versions of bm on nodes in deletefrom. |
|
192 | 183 |
General Comments 0
You need to be logged in to leave comments.
Login now