# HG changeset patch # User Bryan O'Sullivan # Date 1452892488 28800 # Node ID f54bf1f4156662add75601338443ed3f4dcb8b7b # Parent f6979b8f33c195487b959d8990df5501385afb4b with: use context manager for transaction in rebase diff -r f6979b8f33c1 -r f54bf1f41566 hgext/rebase.py --- a/hgext/rebase.py Fri Jan 15 13:14:47 2016 -0800 +++ b/hgext/rebase.py Fri Jan 15 13:14:48 2016 -0800 @@ -547,17 +547,12 @@ collapsedas = newnode clearrebased(ui, repo, state, skipped, collapsedas) - tr = None - try: - tr = repo.transaction('bookmark') + with repo.transaction('bookmark') as tr: if currentbookmarks: updatebookmarks(repo, targetnode, nstate, currentbookmarks, tr) if activebookmark not in repo._bookmarks: # active bookmark was divergent one and has been deleted activebookmark = None - tr.close() - finally: - release(tr) clearstatus(repo) ui.note(_("rebase completed\n"))