61 |
61 |
62 from mercurial.i18n import _ |
62 from mercurial.i18n import _ |
63 from mercurial.node import bin, hex, short, nullid, nullrev |
63 from mercurial.node import bin, hex, short, nullid, nullrev |
64 from mercurial.lock import release |
64 from mercurial.lock import release |
65 from mercurial import commands, cmdutil, hg, scmutil, util, revset |
65 from mercurial import commands, cmdutil, hg, scmutil, util, revset |
66 from mercurial import repair, extensions, error, phases |
66 from mercurial import repair, extensions, error, phases, bookmarks |
67 from mercurial import patch as patchmod |
67 from mercurial import patch as patchmod |
68 from mercurial import localrepo |
68 from mercurial import localrepo |
69 from mercurial import subrepo |
69 from mercurial import subrepo |
70 import os, re, errno, shutil |
70 import os, re, errno, shutil |
71 |
71 |
3075 update = False |
3075 update = False |
3076 finally: |
3076 finally: |
3077 wlock.release() |
3077 wlock.release() |
3078 |
3078 |
3079 if opts.get('bookmark'): |
3079 if opts.get('bookmark'): |
|
3080 if mark == repo._bookmarkcurrent: |
|
3081 bookmarks.setcurrent(repo, None) |
3080 del marks[mark] |
3082 del marks[mark] |
3081 marks.write() |
3083 marks.write() |
3082 ui.write(_("bookmark '%s' deleted\n") % mark) |
3084 ui.write(_("bookmark '%s' deleted\n") % mark) |
3083 |
3085 |
3084 repo.mq.strip(repo, revs, backup=backup, update=update, |
3086 repo.mq.strip(repo, revs, backup=backup, update=update, |