Show More
@@ -1180,13 +1180,20 b' def movebookmarks(ui, repo, mapping, old' | |||
|
1180 | 1180 | # nothing to move |
|
1181 | 1181 | moves.append((bk, new[-1])) |
|
1182 | 1182 | if moves: |
|
1183 | marks = repo._bookmarks | |
|
1184 | for mark, new in moves: | |
|
1185 |
|
|
|
1186 | ui.note(_('histedit: moving bookmarks %s from %s to %s\n') | |
|
1187 | % (mark, node.short(old), node.short(new))) | |
|
1188 |
|
|
|
1189 | marks.write() | |
|
1183 | lock = tr = None | |
|
1184 | try: | |
|
1185 | lock = repo.lock() | |
|
1186 | tr = repo.transaction('histedit') | |
|
1187 | marks = repo._bookmarks | |
|
1188 | for mark, new in moves: | |
|
1189 | old = marks[mark] | |
|
1190 | ui.note(_('histedit: moving bookmarks %s from %s to %s\n') | |
|
1191 | % (mark, node.short(old), node.short(new))) | |
|
1192 | marks[mark] = new | |
|
1193 | marks.recordchange(tr) | |
|
1194 | tr.close() | |
|
1195 | finally: | |
|
1196 | release(tr, lock) | |
|
1190 | 1197 | |
|
1191 | 1198 | def cleanupnode(ui, repo, name, nodes): |
|
1192 | 1199 | """strip a group of nodes from the repository |
General Comments 0
You need to be logged in to leave comments.
Login now