Show More
@@ -78,9 +78,7 b' def strip(ui, repo, revs, update=True, b' | |||||
78 | with repo.transaction('strip') as tr: |
|
78 | with repo.transaction('strip') as tr: | |
79 | if repo._activebookmark in bookmarks: |
|
79 | if repo._activebookmark in bookmarks: | |
80 | bookmarksmod.deactivate(repo) |
|
80 | bookmarksmod.deactivate(repo) | |
81 | for bookmark in bookmarks: |
|
81 | repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks]) | |
82 | del repomarks[bookmark] |
|
|||
83 | repomarks.recordchange(tr) |
|
|||
84 | for bookmark in sorted(bookmarks): |
|
82 | for bookmark in sorted(bookmarks): | |
85 | ui.write(_("bookmark '%s' deleted\n") % bookmark) |
|
83 | ui.write(_("bookmark '%s' deleted\n") % bookmark) | |
86 |
|
84 | |||
@@ -157,9 +155,8 b' def stripcmd(ui, repo, *revs, **opts):' | |||||
157 | revs.update(set(rsrevs)) |
|
155 | revs.update(set(rsrevs)) | |
158 | if not revs: |
|
156 | if not revs: | |
159 | with repo.lock(), repo.transaction('bookmark') as tr: |
|
157 | with repo.lock(), repo.transaction('bookmark') as tr: | |
160 |
for b |
|
158 | bmchanges = [(b, None) for b in bookmarks] | |
161 | del repomarks[bookmark] |
|
159 | repomarks.applychanges(repo, tr, bmchanges) | |
162 | repomarks.recordchange(tr) |
|
|||
163 | for bookmark in sorted(bookmarks): |
|
160 | for bookmark in sorted(bookmarks): | |
164 | ui.write(_("bookmark '%s' deleted\n") % bookmark) |
|
161 | ui.write(_("bookmark '%s' deleted\n") % bookmark) | |
165 |
|
162 |
General Comments 0
You need to be logged in to leave comments.
Login now