##// END OF EJS Templates
repair: use bookmarks.recordchange instead of bookmarks.write...
Laurent Charignon -
r27157:5f2e4eb0 default
parent child Browse files
Show More
@@ -203,6 +203,18 b' def strip(ui, repo, nodelist, backup=Tru'
203 repo.ui.popbuffer()
203 repo.ui.popbuffer()
204 f.close()
204 f.close()
205
205
206 for m in updatebm:
207 bm[m] = repo[newbmtarget].node()
208 lock = tr = None
209 try:
210 lock = repo.lock()
211 tr = repo.transaction('repair')
212 bm.recordchange(tr)
213 tr.close()
214 finally:
215 tr.release()
216 lock.release()
217
206 # remove undo files
218 # remove undo files
207 for undovfs, undofile in repo.undofiles():
219 for undovfs, undofile in repo.undofiles():
208 try:
220 try:
@@ -212,9 +224,6 b' def strip(ui, repo, nodelist, backup=Tru'
212 ui.warn(_('error removing %s: %s\n') %
224 ui.warn(_('error removing %s: %s\n') %
213 (undovfs.join(undofile), str(e)))
225 (undovfs.join(undofile), str(e)))
214
226
215 for m in updatebm:
216 bm[m] = repo[newbmtarget].node()
217 bm.write()
218 except: # re-raises
227 except: # re-raises
219 if backupfile:
228 if backupfile:
220 ui.warn(_("strip failed, full bundle stored in '%s'\n")
229 ui.warn(_("strip failed, full bundle stored in '%s'\n")
General Comments 0
You need to be logged in to leave comments. Login now