# HG changeset patch # User Bryan O'Sullivan # Date 1452892486 28800 # Node ID 6ad5e134ef2e2508d6d5e46a29fb6bbe4bf31c1b # Parent a5eae47aa1f895efff95898fda3f8a0dae0b1502 with: use context manager for wlock in debugsetparents diff -r a5eae47aa1f8 -r 6ad5e134ef2e mercurial/commands.py --- a/mercurial/commands.py Fri Jan 15 13:14:46 2016 -0800 +++ b/mercurial/commands.py Fri Jan 15 13:14:46 2016 -0800 @@ -3386,13 +3386,10 @@ r1 = scmutil.revsingle(repo, rev1).node() r2 = scmutil.revsingle(repo, rev2, 'null').node() - wlock = repo.wlock() - try: + with repo.wlock(): repo.dirstate.beginparentchange() repo.setparents(r1, r2) repo.dirstate.endparentchange() - finally: - wlock.release() @command('debugdirstate|debugstate', [('', 'nodates', None, _('do not display the saved mtime')),