equal
deleted
inserted
replaced
62 |
62 |
63 repair.strip(ui, repo, revs, backup) |
63 repair.strip(ui, repo, revs, backup) |
64 |
64 |
65 repomarks = repo._bookmarks |
65 repomarks = repo._bookmarks |
66 if bookmarks: |
66 if bookmarks: |
67 tr = None |
67 with repo.transaction('strip') as tr: |
68 try: |
|
69 tr = repo.transaction('strip') |
|
70 if repo._activebookmark in bookmarks: |
68 if repo._activebookmark in bookmarks: |
71 bookmarksmod.deactivate(repo) |
69 bookmarksmod.deactivate(repo) |
72 for bookmark in bookmarks: |
70 for bookmark in bookmarks: |
73 del repomarks[bookmark] |
71 del repomarks[bookmark] |
74 repomarks.recordchange(tr) |
72 repomarks.recordchange(tr) |
75 tr.close() |
73 for bookmark in sorted(bookmarks): |
76 for bookmark in sorted(bookmarks): |
74 ui.write(_("bookmark '%s' deleted\n") % bookmark) |
77 ui.write(_("bookmark '%s' deleted\n") % bookmark) |
|
78 finally: |
|
79 release(tr) |
|
80 finally: |
75 finally: |
81 release(lock, wlock) |
76 release(lock, wlock) |
82 |
77 |
83 |
78 |
84 @command("strip", |
79 @command("strip", |